Merge lp:~salgado/offspring/build-lists into lp:~linaro-automation/offspring/private-builds

[Guilherme Salgado]

This branch changes the builds() view to be privacy aware, so that private builds are shown if the user is allowed to see them. It also adds the padlock icon to the project builds view (/builds/<projectname>), when the project is private.

[James Tunnicliffe (dooferlad)]

Looks good.

review: Approve

[Guilherme Salgado (salgado)]

Thanks for the review, James

=== modified file 'lib/offspring/web/queuemanager/tests/test_views.py'
--- lib/offspring/web/queuemanager/tests/test_views.py	2011-10-10 15:01:45 +0000
+++ lib/offspring/web/queuemanager/tests/test_views.py	2011-10-13 23:08:23 +0000
@@ -259,6 +259,53 @@
         self.assertEqual([], list(access_group.members.all()))
 
 
+class ProjectBuildsViewTests(TestCase, ProjectViewTestsMixin):
+    view_path = 'offspring.web.queuemanager.views.builds'
+
+    def get_expected_page_heading(self, project):
+        return 'Build Records for %s' % project.title
+
+    def test_public_project(self):
+        project = factory.makeProject(is_private=False)
+        build = factory.makeBuildResult(project=project)
+        response = self.client.get(
+            reverse(self.view_path, args=[project.name]))
+        self.assertContains(
+            response, self.get_expected_page_heading(project),
+            status_code=200, msg_prefix=response.content)
+
+
+class OverallBuildsViewTests(TestCase):
+    view_path = 'offspring.web.queuemanager.views.builds'
+
+    def test_public_builds_are_shown(self):
+        project = factory.makeProject(is_private=False)
+        build = factory.makeBuildResult(project=project)
+        response = self.client.get(reverse(self.view_path))
+        self.assertContains(
+            response, build.name, status_code=200, msg_prefix=response.content)
+
+    def test_private_builds_are_shown_if_user_has_rights(self):
+        project = factory.makeProject(is_private=True)
+        build = factory.makeBuildResult(project=project)
+        user = project.owner
+        self.assertTrue(
+            self.client.login(username=user.username, password=user.username))
+        response = self.client.get(reverse(self.view_path))
+        self.assertContains(
+            response, build.name, status_code=200, msg_prefix=response.content)
+
+    def test_private_builds_are_not_shown_if_user_has_no_rights(self):
+        project = factory.makeProject(is_private=True)
+        build = factory.makeBuildResult(project=project)
+        user = factory.makeUser()
+        self.assertTrue(
+            self.client.login(username=user.username, password=user.username))
+        response = self.client.get(reverse(self.view_path))
+        self.assertNotContains(
+            response, build.name, status_code=200, msg_prefix=response.content)
+
+
 def make_user_and_login(client):
     user = factory.makeUser()
     return client.login(username=user.username, password=user.username)
 
=== modified file 'lib/offspring/web/queuemanager/views.py'
--- lib/offspring/web/queuemanager/views.py	2011-10-10 20:40:28 +0000
+++ lib/offspring/web/queuemanager/views.py	2011-10-13 23:08:23 +0000
@@ -104,13 +104,15 @@
         context_instance=RequestContext(request))
 
 def builds(request, projectName=None):
+    user = request.user
+    user_visible_builds = BuildResult.all_objects.accessible_by_user(user)
     if projectName is not None:
-        p = get_object_or_404(Project, pk=projectName)
-        buildResults_list = BuildResult.objects.filter(
-            project = projectName).order_by("finished_at").reverse()
+        p = get_possibly_private_object(user, Project, pk=projectName)
+        buildResults_list = user_visible_builds.filter(
+            project=projectName).order_by("finished_at").reverse()
     else:
         p = None
-        buildResults_list = BuildResult.objects.select_related(
+        buildResults_list = user_visible_builds.select_related(
             'builder', 'requestor', 'project').order_by("finished_at").reverse()
     paginator = Paginator(buildResults_list, 15)
 
@@ -124,8 +126,12 @@
     except (EmptyPage, InvalidPage):
         buildResults = paginator.page(paginator.num_pages)
 
+    is_private = False
+    if p is not None and p.is_private:
+        is_private = True
     pageData = { 
         'project' : p, 
+        'is_private' : is_private,
         'build_results' : buildResults,
         'pillar' : 'builds' 
     }
@@ -229,7 +235,9 @@
         request.user)
     p = get_possibly_private_object(
         request.user, user_visible_objects, pk=projectName)
-    project_build_results = BuildResult.objects.filter(
+    user_visible_builds = BuildResult.all_objects.accessible_by_user(
+        request.user)
+    project_build_results = user_visible_builds.filter(
         project = p).exclude(result = None)
     build_stats = { 
         'fail_count' : project_build_results.filter(result = ProjectBuildStates.FAILED).count(),