Merge lp:~cjwatson/launchpad/testfix-unhide-comments into lp:launchpad

[Colin Watson]

Make direct links to hidden comments work for their owners.

Make direct links to hidden comments work for their owners. Fixes xx-bug-hidden-comments test failure.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2015-09-14 15:56:21 +0000
+++ lib/lp/bugs/browser/bugtask.py	2015-09-14 23:53:13 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2014 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2015 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """IBugTask-related browser views."""
@@ -292,6 +292,9 @@
     # cannot see, because they have been marked invisible.
     strip_invisible = True
     if user is not None:
+        # XXX cjwatson 2015-09-15: Unify with
+        # Bug.userCanSetCommentVisibility, which also allows
+        # project-privileged users.
         role = PersonRoles(user)
         strip_invisible = not (role.in_admin or role.in_registry_experts)
     if strip_invisible:
@@ -383,9 +386,14 @@
         # Ask the DB to slice out just the comment that we need.
         comments = get_comments_for_bugtask(
             self.context, slice_info=[slice(index, index + 1)])
+        # XXX cjwatson 2015-09-15: Unify with
+        # Bug.userCanSetCommentVisibility, which also allows
+        # project-privileged users.
+        role = PersonRoles(getUtility(ILaunchBag).user)
         if (comments and
             (comments[0].visible
-             or check_permission('launchpad.Admin', self.context))):
+             or comments[0].owner == getUtility(ILaunchBag).user
+             or role.in_admin or role.in_registry_experts)):
             return comments[0]
         return None