Merge lp:~ivo-kracht/launchpad/bug-921901 into lp:launchpad

[Ivo Kracht]

bug column tags now link to project groups

I changed the base_tag_url so that it links to the search context and wrote a unit test for it.

Pre-imp call with adeuring

test:
./bin/test bugs -vvt test_tag_urls_use_view_context

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/bugs/browser/bugtask.py
  lib/lp/bugs/browser/tests/test_bugtask.py

[Richard Harding (rharding)]

Looks good, thanks!

review: Approve

[Ivo Kracht (ivo-kracht)]

Ec2 test failed because I overlooked the possibility that there is no target context, e.g. when you click on “bugs“ while viewing a user account. This case is now intercepted and the task context is used instead of the search context. I also had to write a seperate test for that case.

Pre-imp call with adeuring

test:
./bin/test bugs -vvt test_urls_without_target_context

review: Resubmit

[Graham Binns (gmb)]

Looks good to me.

review: Approve (code)

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2012-06-27 19:42:03 +0000
+++ lib/lp/bugs/browser/bugtask.py	2012-07-04 11:10:56 +0000
@@ -2214,9 +2214,16 @@
             assignee = self.people[self.assigneeID].displayname
         reporter = self.people[self.bug.ownerID]
 
-        base_tag_url = "%s/?field.tag=" % canonical_url(
-            self.bugtask.target,
-            view_name="+bugs")
+        # the case that there is no target context (e.g. viewing bug that
+        # are related to a user account) is intercepted
+        if self.target_context is None:
+            base_tag_url = "%s/?field.tag=" % canonical_url(
+                self.bugtask.target,
+                view_name="+bugs")
+        else:
+            base_tag_url = "%s/?field.tag=" % canonical_url(
+                self.target_context,
+                view_name="+bugs")
 
         flattened = {
             'age': age,

=== modified file 'lib/lp/bugs/browser/tests/test_bugtask.py'
--- lib/lp/bugs/browser/tests/test_bugtask.py	2012-06-26 10:19:37 +0000
+++ lib/lp/bugs/browser/tests/test_bugtask.py	2012-07-04 11:10:56 +0000
@@ -306,6 +306,7 @@
             view = create_initialized_view(bugtask, name="+index")
             self.assertEqual('Private', view.information_type)
 
+
 class TestBugTasksAndNominationsView(TestCaseWithFactory):
 
     layer = DatabaseFunctionalLayer
@@ -1874,8 +1875,11 @@
             unbatched_view.activity_and_comments[4:],
             batched_view.activity_and_comments)
 
-
-def make_bug_task_listing_item(factory, bugtask=None):
+no_target_specified = object()
+
+
+def make_bug_task_listing_item(
+    factory, bugtask=None, target_context=no_target_specified):
     if bugtask is None:
         owner = factory.makePerson()
         bug = factory.makeBug(
@@ -1893,6 +1897,8 @@
     if tags != {}:
         tags = tags[bugtask.id]
     people = bug_task_set.getBugTaskPeople([bugtask])
+    if target_context is no_target_specified:
+        target_context = bugtask.target
     return owner, BugTaskListingItem(
         bugtask,
         badge_property['has_branch'],
@@ -1900,7 +1906,7 @@
         badge_property['has_patch'],
         tags,
         people,
-        target_context=bugtask.target)
+        target_context=target_context)
 
 
 @contextmanager
@@ -2441,6 +2447,31 @@
             milestone_name = item.milestone.displayname
             self.assertEqual(milestone_name, item.model['milestone_name'])
 
+    def test_tag_urls_use_view_context(self):
+        """urls contain the correct project group if target_context is None"""
+        project_group = self.factory.makeProject()
+        product = self.factory.makeProduct(project=project_group)
+        bug = self.factory.makeBug(product=product)
+        with person_logged_in(bug.owner):
+            bug.tags = ['foo']
+        owner, item = make_bug_task_listing_item(
+            self.factory, bug.default_bugtask, target_context=project_group)
+        url = item.model['tags'][0]['url']
+        self.assertTrue(url.startswith(
+            canonical_url(project_group, view_name="+bugs")))
+
+    def test_urls_without_target_context(self):
+        """urls contain the project if target_context is not None"""
+        product = self.factory.makeProduct()
+        bug = self.factory.makeBug(product=product)
+        with person_logged_in(bug.owner):
+            bug.tags = ['foo']
+        owner, item = make_bug_task_listing_item(
+            self.factory, bug.default_bugtask, target_context=None)
+        url = item.model['tags'][0]['url']
+        self.assertTrue(url.startswith(
+            canonical_url(product, view_name="+bugs")))
+
     def test_model_assignee(self):
         """Model contains expected fields with expected values."""
         assignee = self.factory.makePerson(displayname='Example Person')