Merge lp:~kfogel/launchpad/78565-bug-comment-link-to-bug into lp:launchpad

[Karl Fogel]

When visiting a bug comment page, extend the breadcrumbs to include the comment and make the next rightmost item in the breadcrumbs (the parent bug's number) a link to the bug.

[Eleanor Berger (intellectronica)]

review: Approve (code)

=== modified file 'lib/lp/bugs/browser/bugcomment.py'
--- lib/lp/bugs/browser/bugcomment.py	2009-12-10 14:44:24 +0000
+++ lib/lp/bugs/browser/bugcomment.py	2010-03-22 23:03:21 +0000
@@ -10,6 +10,7 @@
     'BugCommentBoxView',
     'BugCommentBoxExpandedReplyView',
     'BugCommentXHTMLRepresentation',
+    'BugMessageBreadcrumb',
     'build_comments_from_chunks',
     'should_display_remote_comments',
     ]
@@ -25,6 +26,7 @@
 from canonical.launchpad.webapp import canonical_url, LaunchpadView
 from canonical.launchpad.webapp.interfaces import ILaunchBag
 from canonical.launchpad.webapp.authorization import check_permission
+from canonical.launchpad.webapp.breadcrumb import Breadcrumb
 
 from canonical.config import config
 
@@ -253,3 +255,13 @@
             (self.comment, self.request), name="+box")
         return comment_view()
 
+
+class BugCommentBreadcrumb(Breadcrumb):
+    """Breadcrumb for an `IBugComment`."""
+
+    def __init__(self, context):
+        super(BugCommentBreadcrumb, self).__init__(context)
+
+    @property
+    def text(self):
+        return "Comment #%d" % self.context.index

=== modified file 'lib/lp/bugs/browser/tests/test_breadcrumbs.py'
--- lib/lp/bugs/browser/tests/test_breadcrumbs.py	2009-09-22 18:45:02 +0000
+++ lib/lp/bugs/browser/tests/test_breadcrumbs.py	2010-03-22 23:03:21 +0000
@@ -43,6 +43,18 @@
         texts = self._getBreadcrumbsTexts(url, self.traversed_objects)
         self.assertEquals(texts[-2], "Bug #%d" % self.bug.id)
 
+    def test_bugtask_comment(self):
+        login('[e-mail]')
+        comment = self.factory.makeBugComment(
+            bug=self.bug, owner=self.bug.owner,
+            subject="test comment subject", body="test comment body")
+        url = canonical_url(comment, rootsite='bugs')
+        urls = self._getBreadcrumbsURLs(url, self.traversed_objects)
+        texts = self._getBreadcrumbsTexts(url, self.traversed_objects)
+        self.assertEquals(url, "%s/comments/1" % self.bugtask_url)
+        self.assertEquals(urls[-1], "%s" % self.bugtask_url)
+        self.assertEquals(texts[-1], "Bug #%d" % self.bug.id)
+
     def test_bugtask_private_bug(self):
         # A breadcrumb is not generated for a bug that the user does
         # not have permission to view.

=== modified file 'lib/lp/bugs/configure.zcml'
--- lib/lp/bugs/configure.zcml	2010-03-08 13:51:22 +0000
+++ lib/lp/bugs/configure.zcml	2010-03-22 23:03:21 +0000
@@ -282,6 +282,11 @@
             for="lp.bugs.interfaces.bugtask.IBugTask"
             factory="lp.bugs.browser.bugtask.BugTaskBreadcrumb"
             permission="zope.Public"/>
+        <adapter
+            provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
+            for="lp.bugs.interfaces.bugmessage.IBugComment"
+            factory="lp.bugs.browser.bugcomment.BugCommentBreadcrumb"
+            permission="zope.Public"/>
 
         <!-- NullBugTask -->
 

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-comments-truncated.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-comments-truncated.txt	2009-09-23 14:40:53 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-comments-truncated.txt	2010-03-22 23:03:21 +0000
@@ -53,7 +53,7 @@
 The whole comment is visible on this page:
 
     >>> print browser.title
-    Bug #2 (blackhole) : Bugs : Tomcat
+    Comment #1 : Bug #2 (blackhole) : Bugs : Tomcat
 
     >>> print_comments(browser.contents) #doctest: -ELLIPSIS
     <div class="boardCommentBody">

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-03-15 15:12:20 +0000
+++ lib/lp/testing/factory.py	2010-03-22 23:03:21 +0000
@@ -1212,6 +1212,33 @@
         return getUtility(IBugWatchSet).createBugWatch(
             bug, owner, bugtracker, str(remote_bug))
 
+    def makeBugComment(self, bug=None, owner=None, subject=None, body=None):
+        """Create and return a new bug comment.
+
+        :param bug: An `IBug` or a bug ID or name, or None, in which
+            case a new bug is created.
+        :param owner: An `IPerson`, or None, in which case a new
+            person is created.
+        :param subject: An `IMessage` or a string, or None, in which
+            case a new message will be generated.
+        :param body: An `IMessage` or a string, or None, in which
+            case a new message will be generated.
+        :return: An `IBugMessage`.
+        """
+        if bug is None:
+            bug = self.makeBug()
+        elif isinstance(bug, (int, long, basestring)):
+            bug = getUtility(IBugSet).getByNameOrID(str(bug))
+        if owner is None:
+            owner = self.makePerson()
+        if subject is None:
+            subject = self.getUniqueString()
+        if body is None:
+            body = self.getUniqueString()
+        return bug.newMessage(owner=owner, subject=subject,
+                              content=body, parent=None, bugwatch=None,
+                              remote_comment_id=None)
+
     def makeBugAttachment(self, bug=None, owner=None, data=None,
                           comment=None, filename=None, content_type=None,
                           description=None, is_patch=_DEFAULT):