Merge lp:~bac/launchpad/bug-639703-pg-bugs into lp:launchpad

[Brad Crittenden]

Correctly report bug tracking status for project groups.

= Summary =

Currently if a project group has sub-projects but none use Launchpad for
bug tracking a user will be allowed to attempt to file a bug. At the
next step the user is informed there are no projects that track bugs in LP.

== Proposed fix ==

Prevent such a project group from displaying the portlets and providing
links to bug reporting and other bug activities.

== Pre-implementation notes ==

Talk with Curtis

== Implementation details ==

As above

== Tests ==

bin/test -vvm lp.bugs -t test_bugtask

== Demo and Q/A ==

Create a project group and see that it states it does not use Launchpad
for bug tracking. Add a project that does not use bug tracking and
ensure the message is the same. Set one of the project to do bug
tracking and observe the change in the page.

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/testing/views.py
  lib/lp/bugs/templates/buglisting-default.pt
  lib/lp/bugs/browser/tests/test_bugtask.py
  lib/lp/bugs/browser/bugtask.py

./lib/lp/bugs/browser/bugtask.py
    2201: Line exceeds 78 characters.

[Brad Crittenden (bac)]

Screenshot at http://people.canonical.com/~bac/pg-no-buggy.png

[Henning Eggers (henninge)]

Hello Bac,
thanks for making Launchpad a bit more user-friendly! ;-) I still need to send
you on another round-trip, though. Please find my comments below.

Henning

Am 04.10.2010 15:44, schrieb Brad Crittenden:
> === modified file 'lib/lp/bugs/browser/bugtask.py'
> --- lib/lp/bugs/browser/bugtask.py 2010-09-28 14:50:19 +0000
> +++ lib/lp/bugs/browser/bugtask.py 2010-10-04 12:55:59 +0000
> @@ -168,6 +168,7 @@
> ObjectImageDisplayAPI,
> PersonFormatterAPI,
> )
> +
> from canonical.lazr.interfaces import IObjectPrivacy
> from canonical.lazr.utils import smartquote
> from canonical.widgets.bug import BugTagsWidget
> @@ -2987,8 +2988,17 @@
> return False
>
> @property
> + def should_show_bug_information(self):
> + """Return False if a project group that does not use Launchpad."""
> + if not self._projectContext():
> + return True
> + involvement = getMultiAdapter((self.context, self.request),
> + name="+get-involved")
> + return involvement.official_malone

This seems odd, to create a view just to get a property that is really a
property of the context. The "official_malone" property should be defined in
ProjectGroup and could be implemented like this: ;-)

    @cachedproperty
    def offcial_malone(self):
        return any([product.offcial_malone for product in self.products])

Unless I misunderstood something, I see this misuse of a view as a real
blocker for landing this. This earned you the "need-fixing" ;-)

> +
> + @property
> def form_has_errors(self):
> - """Return True of the form has errors, otherwise False."""
> + """Return True if the form has errors, otherwise False."""

Good catch! ;)

> return len(self.errors) > 0
>
> def validateVocabulariesAdvancedForm(self):
>
> === modified file 'lib/lp/bugs/browser/tests/test_bugtask.py'
> --- lib/lp/bugs/browser/tests/test_bugtask.py 2010-09-23 14:51:48 +0000
> +++ lib/lp/bugs/browser/tests/test_bugtask.py 2010-10-04 12:55:59 +0000

[...]

> @@ -418,6 +424,88 @@
> view.form_fields['assignee'].field.vocabularyName)
>
>
> +class TestProjectGroupBugs(TestCaseWithFactory):
> + """Test the bugs overview page for Project Groups."""
> +
> + layer = LaunchpadFunctionalLayer
> +
> + def setUp(self):
> + super(TestProjectGroupBugs, self).setUp()
> + self.owner = self.factory.makePerson(name='bob')
> + self.projectgroup = self.factory.makeProject(name='container',
> + owner=self.owner)
> +
> + def makeSubordinateProduct(self, tracks_bugs_in_lp):
> + """Create a new product and add it to the project group."""
> + product = self.factory.makeProduct(official_malone=tracks_bugs_in_lp)
> + with person_logged_in(product.owner):
> + product.project = self.projectgroup
> + expected = {True: 'LAUNCHPAD',
> + False: 'UNKNOWN',
> + }
> + self.assertEqual(
> + expected[tracks_bugs_in_lp], product.bug_tracking_usage.name)

This looks like a forgotten sanity check? If you wish t...

review: Needs Fixing (code)

[Matthew Revell (matthew.revell)]

Very happy to see this change, thanks Brad.

I'd like to suggest some alternative text:

  Sorry, you can't report a bug for the $ProjectGroup project group. None of the
  projects within the group use Launchpad for bug tracking. Please check the
  $ProjectGroup website for details of where they track bug reports.

I have suggested this change because I think the most important thing about the message is that you can't report the bug you wanted to. Only then should we explain why. I think we should then give the person a next step ... ideally we should link to their external bug tracker, or as a second-best we should link to the project's website. If we can't do either, I think the above text is a nod towards being helpful.

review: Needs Fixing (text)

[Brad Crittenden (bac)]

On Oct 4, 2010, at 22:39 , Henning Eggers wrote:

> Review: Needs Fixing code
> Hello Bac,
> thanks for making Launchpad a bit more user-friendly! ;-) I still need to send
> you on another round-trip, though. Please find my comments below.
>

Thanks for the review Henning.

> Henning
>
> Am 04.10.2010 15:44, schrieb Brad Crittenden:
>> === modified file 'lib/lp/bugs/browser/bugtask.py'
>>
>> @property
>> + def should_show_bug_information(self):
>> + """Return False if a project group that does not use Launchpad."""
>> + if not self._projectContext():
>> + return True
>> + involvement = getMultiAdapter((self.context, self.request),
>> + name="+get-involved")
>> + return involvement.official_malone
>
> This seems odd, to create a view just to get a property that is really a
> property of the context. The "official_malone" property should be defined in
> ProjectGroup and could be implemented like this: ;-)
>
> @cachedproperty
> def offcial_malone(self):
> return any([product.offcial_malone for product in self.products])
>
> Unless I misunderstood something, I see this misuse of a view as a real
> blocker for landing this. This earned you the "need-fixing" ;-)

It does look odd, Henning. For a lot of pillars, including ProjectGroup, the official usage flags are set in PillarView. The pattern you see here is repeated elsewhere.

On IRC we discussed landing this branch and later looking at moving the settings to the appropriate models. The bug for that work is bug 655036.
>
>> @@ -418,6 +424,88 @@
>> view.form_fields['assignee'].field.vocabularyName)
>>
>>
>> +class TestProjectGroupBugs(TestCaseWithFactory):
>> + """Test the bugs overview page for Project Groups."""
>> +
>> + layer = LaunchpadFunctionalLayer
>> +
>> + def setUp(self):
>> + super(TestProjectGroupBugs, self).setUp()
>> + self.owner = self.factory.makePerson(name='bob')
>> + self.projectgroup = self.factory.makeProject(name='container',
>> + owner=self.owner)
>> +
>> + def makeSubordinateProduct(self, tracks_bugs_in_lp):
>> + """Create a new product and add it to the project group."""
>> + product = self.factory.makeProduct(official_malone=tracks_bugs_in_lp)
>> + with person_logged_in(product.owner):
>> + product.project = self.projectgroup
>> + expected = {True: 'LAUNCHPAD',
>> + False: 'UNKNOWN',
>> + }
>> + self.assertEqual(
>> + expected[tracks_bugs_in_lp], product.bug_tracking_usage.name)
>
> This looks like a forgotten sanity check? If you wish to keep it in here you
> should give it its own tests and mention in the comment their sanity nature.

Yes, it serves no purpose and is removed.

>
>> +
>> + def test_empty_project_group(self):
>
> This one and the next three tests belong in the model tests for
> ProjectGroup.official_malone.

Deferred.

>> + def test_project_group_has_portlets_link_if_using_LP(self):
>> + # A project group that has no projects using Launchpad ...

[Brad Crittenden (bac)]

Thanks for the text changes Matthew. On IRC we agreed on:

            You cannot report a bug for <tal:name replace="name"/> as none of
            the projects within the group use Launchpad for bug tracking.
            Please check the individual projects for details
            of where bugs are reported.

[Matthew Revell (matthew.revell)]

review: Approve (text)

[Henning Eggers (henninge)]

So, the code is good now. Thanks for adding the XXX and filing the bug.

UI-wise I find the page too empty and inconsistent with similar pages we have on project groups and projects. Please have a look here:
http://people.canonical.com/~henninge/screenshots/unconfigured_blueprints_pg.png
http://people.canonical.com/~henninge/screenshots/unconfigured_bugtracker.png

The page will at least need a page heading and bread crumbs. The text should most likely be <strong> like on the other pages to indicate that it needs attention. Add a help link for bonus points. ;-)

Thanks

approved code
needs-fixing ui*

review: Needs Fixing (code ui*)

[Brad Crittenden (bac)]

Hi Henning,

Thanks for the UI review. I have added the page heading and breadcrumbs:

http://people.canonical.com/~bac/pg-bugs-no-projects.png
http://people.canonical.com/~bac/pg-bugs-mit-projects.png

I have not yet added a help link but will do so, pending Curtis' UI mentoring review.

[Curtis Hovey (sinzui)]

Thanks Brad and Henning. This is a very nice fix and I am very pleased we fixed some 3.0-ism too. As Henning pointed, we want a consistent experience:

The page should show the owner the same help link as is shown on projects:
    (i) Getting started with bug tracking in Launchpad.
    <https://help.launchpad.net/Bugs>

There is a secondary issue that help does not explain exactly what bug tracking features project groups provide. Actually, Lp has a poor understanding of what PGs provide. I think PG documentation is a secondary issue. We will discuss PGs over the next few months and decide their fate.

review: Approve (ui)

[Henning Eggers (henninge)]

All good now, thanks for improving this! ;-)

review: Approve (code ui*)

[Gavin Panella (allenap)]

Looks like this is all reviewed, so abstaining on behalf of Launchpad code reviewers.

review: Abstain

=== modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py	2010-10-03 15:30:06 +0000
+++ lib/canonical/launchpad/pagetitles.py	2010-10-18 01:11:10 +0000
@@ -146,8 +146,6 @@
 
 buglinktarget_unlinkbugs = 'Remove links to bug reports'
 
-buglisting_default = ContextTitle("Bugs in %s")
-
 def buglisting_embedded_advanced_search(context, view):
     """Return the view's page heading."""
     return view.getSearchPageHeading()

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2010-10-14 20:20:47 +0000
+++ lib/lp/bugs/browser/bugtask.py	2010-10-18 01:11:10 +0000
@@ -2297,7 +2297,7 @@
 
     @cachedproperty
     def bug_tracking_usage(self):
-        """Whether the context tracks bugs in launchpad.
+        """Whether the context tracks bugs in Launchpad.
 
         :returns: ServiceUsage enum value
         """
@@ -2305,6 +2305,12 @@
         return service_usage.bug_tracking_usage
 
     @property
+    def page_title(self):
+        return "Bugs in %s" % self.context.title
+
+    label = page_title
+
+    @property
     def schema(self):
         """Return the schema that defines the form."""
         if self._personContext():
@@ -2838,8 +2844,12 @@
             return False
 
     @property
+    def should_show_bug_information(self):
+        return self.bug_tracking_usage == ServiceUsage.LAUNCHPAD
+
+    @property
     def form_has_errors(self):
-        """Return True of the form has errors, otherwise False."""
+        """Return True if the form has errors, otherwise False."""
         return len(self.errors) > 0
 
     def validateVocabulariesAdvancedForm(self):

=== modified file 'lib/lp/bugs/browser/tests/test_bugtask.py'
--- lib/lp/bugs/browser/tests/test_bugtask.py	2010-10-04 19:50:45 +0000
+++ lib/lp/bugs/browser/tests/test_bugtask.py	2010-10-18 01:11:10 +0000
@@ -19,6 +19,7 @@
     login,
     login_person,
     )
+from canonical.launchpad.testing.pages import find_tag_by_id
 from canonical.launchpad.testing.systemdocs import (
     LayeredDocFileSuite,
     setUp,
@@ -33,7 +34,10 @@
     BugTasksAndNominationsView,
     )
 from lp.bugs.interfaces.bugtask import BugTaskStatus
-from lp.testing import TestCaseWithFactory
+from lp.testing import (
+    person_logged_in,
+    TestCaseWithFactory,
+    )
 from lp.testing._webservice import QueryCollector
 from lp.testing.matchers import HasQueryCount
 from lp.testing.sampledata import (
@@ -41,6 +45,7 @@
     NO_PRIVILEGE_EMAIL,
     USER_EMAIL,
     )
+from lp.testing.views import create_initialized_view
 
 
 class TestBugTaskView(TestCaseWithFactory):
@@ -69,7 +74,8 @@
         self.addCleanup(recorder.unregister)
         self.invalidate_caches(task)
         self.getUserBrowser(url, person_no_teams)
-        # This may seem large: it is; there is easily another 30% fat in there.
+        # This may seem large: it is; there is easily another 30% fat in
+        # there.
         self.assertThat(recorder, HasQueryCount(LessThan(62)))
         count_with_no_teams = recorder.count
         # count with many teams
@@ -418,6 +424,106 @@
             view.form_fields['assignee'].field.vocabularyName)
 
 
+class TestProjectGroupBugs(TestCaseWithFactory):
+    """Test the bugs overview page for Project Groups."""
+
+    layer = LaunchpadFunctionalLayer
+
+    def setUp(self):
+        super(TestProjectGroupBugs, self).setUp()
+        self.owner = self.factory.makePerson(name='bob')
+        self.projectgroup = self.factory.makeProject(name='container',
+                                                     owner=self.owner)
+
+    def makeSubordinateProduct(self, tracks_bugs_in_lp):
+        """Create a new product and add it to the project group."""
+        product = self.factory.makeProduct(official_malone=tracks_bugs_in_lp)
+        with person_logged_in(product.owner):
+            product.project = self.projectgroup
+
+    def test_empty_project_group(self):
+        # An empty project group does not use Launchpad for bugs.
+        view = create_initialized_view(
+            self.projectgroup, name=u'+bugs', rootsite='bugs')
+        self.assertFalse(self.projectgroup.hasProducts())
+        self.assertFalse(view.should_show_bug_information)
+
+    def test_project_group_with_subordinate_not_using_launchpad(self):
+        # A project group with all subordinates not using Launchpad
+        # will itself be marked as not using Launchpad for bugs.
+        self.makeSubordinateProduct(False)
+        self.assertTrue(self.projectgroup.hasProducts())
+        view = create_initialized_view(
+            self.projectgroup, name=u'+bugs', rootsite='bugs')
+        self.assertFalse(view.should_show_bug_information)
+
+    def test_project_group_with_subordinate_using_launchpad(self):
+        # A project group with one subordinate using Launchpad
+        # will itself be marked as using Launchpad for bugs.
+        self.makeSubordinateProduct(True)
+        self.assertTrue(self.projectgroup.hasProducts())
+        view = create_initialized_view(
+            self.projectgroup, name=u'+bugs', rootsite='bugs')
+        self.assertTrue(view.should_show_bug_information)
+
+    def test_project_group_with_mixed_subordinates(self):
+        # A project group with one or more subordinates using Launchpad
+        # will itself be marked as using Launchpad for bugs.
+        self.makeSubordinateProduct(False)
+        self.makeSubordinateProduct(True)
+        self.assertTrue(self.projectgroup.hasProducts())
+        view = create_initialized_view(
+            self.projectgroup, name=u'+bugs', rootsite='bugs')
+        self.assertTrue(view.should_show_bug_information)
+
+    def test_project_group_has_no_portlets_if_not_using_LP(self):
+        # A project group that has no projects using Launchpad will not have
+        # bug portlets.
+        self.makeSubordinateProduct(False)
+        view = create_initialized_view(
+            self.projectgroup, name=u'+bugs', rootsite='bugs',
+            current_request=True)
+        self.assertFalse(view.should_show_bug_information)
+        contents = view.render()
+        report_a_bug = find_tag_by_id(contents, 'bug-portlets')
+        self.assertIs(None, report_a_bug)
+
+    def test_project_group_has_portlets_link_if_using_LP(self):
+        # A project group that has projects using Launchpad will have a
+        # portlets.
+        self.makeSubordinateProduct(True)
+        view = create_initialized_view(
+            self.projectgroup, name=u'+bugs', rootsite='bugs',
+            current_request=True)
+        self.assertTrue(view.should_show_bug_information)
+        contents = view.render()
+        report_a_bug = find_tag_by_id(contents, 'bug-portlets')
+        self.assertIsNot(None, report_a_bug)
+
+    def test_project_group_has_help_link_if_not_using_LP(self):
+        # A project group that has no projects using Launchpad will have
+        # a 'Getting started' help link.
+        self.makeSubordinateProduct(False)
+        view = create_initialized_view(
+            self.projectgroup, name=u'+bugs', rootsite='bugs',
+            current_request=True)
+        contents = view.render()
+        help_link = find_tag_by_id(contents, 'getting-started-help')
+        self.assertIsNot(None, help_link)
+
+    def test_project_group_has_no_help_link_if_using_LP(self):
+        # A project group that has no projects using Launchpad will not have
+        # a 'Getting started' help link.
+        self.makeSubordinateProduct(True)
+        view = create_initialized_view(
+            self.projectgroup, name=u'+bugs', rootsite='bugs',
+            current_request=True)
+        contents = view.render()
+        help_link = find_tag_by_id(contents, 'getting-started-help')
+        print help_link
+        self.assertIs(None, help_link)
+
+
 def test_suite():
     suite = unittest.TestLoader().loadTestsFromName(__name__)
     suite.addTest(DocTestSuite(bugtask))

=== modified file 'lib/lp/bugs/configure.zcml'
--- lib/lp/bugs/configure.zcml	2010-10-07 10:12:25 +0000
+++ lib/lp/bugs/configure.zcml	2010-10-18 01:11:10 +0000
@@ -1036,6 +1036,12 @@
         for="lp.bugs.interfaces.bugtarget.IBugTarget"
         factory="lp.bugs.browser.bugtarget.BugsVHostBreadcrumb"
         permission="zope.Public"/>
+    <adapter
+        name="bugs"
+        provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
+        for="lp.registry.interfaces.projectgroup.IProjectGroup"
+        factory="lp.bugs.browser.bugtarget.BugsVHostBreadcrumb"
+        permission="zope.Public"/>
 
     <!-- ProcessApportBlobJobs -->
     <class class="lp.bugs.model.apportjob.ProcessApportBlobJob">

=== modified file 'lib/lp/bugs/stories/bug-release-management/xx-review-nominated-bugs.txt'
--- lib/lp/bugs/stories/bug-release-management/xx-review-nominated-bugs.txt	2010-09-28 03:01:37 +0000
+++ lib/lp/bugs/stories/bug-release-management/xx-review-nominated-bugs.txt	2010-10-18 01:11:10 +0000
@@ -8,7 +8,7 @@
     >>> anon_browser.open('http://bugs.launchpad.dev/ubuntu/hoary')
     >>> anon_browser.getLink('Review nominations').click()
     >>> print anon_browser.title
-    Bugs nominated for Hoary...
+    Bugs in The Hoary Hedgehog Release : Bugs : Hoary (5.04) : Ubuntu
 
 All the basic bug details are displayed.
 
@@ -22,7 +22,7 @@
     >>> user_browser.open('http://bugs.launchpad.dev/ubuntu/hoary')
     >>> user_browser.getLink('Review nominations').click()
     >>> print anon_browser.title
-    Bugs nominated for Hoary...
+    Bugs in The Hoary Hedgehog Release : Bugs : Hoary (5.04) : Ubuntu
 
     >>> print_bugtasks(user_browser.contents)
     1  Firefox does not support SVG  mozilla-firefox  Medium  New
@@ -63,7 +63,7 @@
     >>> admin_browser.open('http://bugs.launchpad.dev/ubuntu/hoary')
     >>> admin_browser.getLink('Review nominations').click()
     >>> print anon_browser.title
-    Bugs nominated for Hoary...
+    Bugs in The Hoary Hedgehog Release : Bugs : Hoary (5.04) : Ubuntu
 
     >>> print_bugtasks(admin_browser.contents)
     1  Firefox does not support SVG  mozilla-firefox  Medium  New
@@ -114,7 +114,7 @@
     >>> user_browser.open('http://bugs.launchpad.dev/firefox/1.0')
     >>> user_browser.getLink('Review nominations').click()
     >>> print user_browser.title
-    Bugs nominated for 1.0...
+     Bugs in Mozilla Firefox 1.0 series : Bugs : Series 1.0 : Mozilla Firefox
 
     >>> print_bugtasks(user_browser.contents)
     1  Firefox does not support SVG Low  New

=== modified file 'lib/lp/bugs/stories/bugs/xx-front-page-search.txt'
--- lib/lp/bugs/stories/bugs/xx-front-page-search.txt	2010-04-16 15:06:55 +0000
+++ lib/lp/bugs/stories/bugs/xx-front-page-search.txt	2010-10-18 01:11:10 +0000
@@ -142,8 +142,8 @@
     >>> anon_browser.getControl(name='field.scope.target').value = 'gnome'
     >>> anon_browser.getControl(name='field.searchtext').value = 'test bug'
     >>> anon_browser.getControl('Search Bug Reports').click()
-    >>> anon_browser.title
-    'Bugs in The GNOME Project'
+    >>> print anon_browser.title
+    Bugs : GNOME
     >>> anon_browser.url
     'http://bugs.launchpad.dev/gnome/+bugs?field.searchtext=test+bug...'
     >>> print_bugtasks(anon_browser.contents)

=== modified file 'lib/lp/bugs/stories/bugs/xx-portlets-bug-milestones.txt'
--- lib/lp/bugs/stories/bugs/xx-portlets-bug-milestones.txt	2009-09-20 22:11:49 +0000
+++ lib/lp/bugs/stories/bugs/xx-portlets-bug-milestones.txt	2010-10-18 01:11:10 +0000
@@ -4,7 +4,19 @@
 The milestone-targeted bugs portlet displays the number of bugs that have
 been targeted to a specific milestone.
 
-This portlet is available from a distribution's bug page.
+This portlet is not available from a distribution's bug page if it
+does not use Launchpad for tracking bugs.
+
+    >>> anon_browser.open("http://bugs.launchpad.dev/debian/+bugs")
+    >>> portlet = find_portlet(
+    ...     anon_browser.contents, "Milestone-targeted bugs")
+    >>> print portlet
+    None
+
+Change debian to track bugs in Launchpad and the portlet becomes visible.
+
+    >>> from lp.testing.service_usage_helpers import set_service_usage
+    >>> set_service_usage('debian', bug_tracking_usage='LAUNCHPAD')
 
     >>> anon_browser.open("http://bugs.launchpad.dev/debian/+bugs")
     >>> portlet = find_portlet(

=== modified file 'lib/lp/bugs/stories/bugs/xx-portlets-bug-series.txt'
--- lib/lp/bugs/stories/bugs/xx-portlets-bug-series.txt	2010-01-18 20:06:06 +0000
+++ lib/lp/bugs/stories/bugs/xx-portlets-bug-series.txt	2010-10-18 01:11:10 +0000
@@ -1,6 +1,19 @@
 The series-targeted portlet displays the number of open bugs that have
 been accepted as targeting a specific series of a distribution:
 
+This portlet is not available from a distribution's bug page if it
+does not use Launchpad for tracking bugs.
+
+  >>> anon_browser.open("http://bugs.launchpad.dev/debian/+bugs")
+  >>> portlet = find_portlet(anon_browser.contents, "Series-targeted bugs")
+  >>> print portlet
+  None
+
+Change debian to track bugs in Launchpad and the portlet becomes visible.
+
+  >>> from lp.testing.service_usage_helpers import set_service_usage
+  >>> set_service_usage('debian', bug_tracking_usage='LAUNCHPAD')
+
   >>> anon_browser.open("http://bugs.launchpad.dev/debian/+bugs")
   >>> portlet = find_portlet(anon_browser.contents, "Series-targeted bugs")
   >>> print extract_text(portlet)
@@ -51,4 +64,3 @@
   >>> print extract_text(portlet)
   Series-targeted bugs
   1.0   1
-

=== modified file 'lib/lp/bugs/stories/bugs/xx-project-bugs-page.txt'
--- lib/lp/bugs/stories/bugs/xx-project-bugs-page.txt	2010-04-16 15:06:55 +0000
+++ lib/lp/bugs/stories/bugs/xx-project-bugs-page.txt	2010-10-18 01:11:10 +0000
@@ -5,4 +5,4 @@
 
     >>> anon_browser.open('http://bugs.launchpad.dev/gnome')
     >>> print anon_browser.title
-    Bugs in The GNOME Project
+    Bugs : GNOME

=== modified file 'lib/lp/bugs/stories/bugtask-searches/xx-advanced-people-filters.txt'
--- lib/lp/bugs/stories/bugtask-searches/xx-advanced-people-filters.txt	2010-10-05 22:04:38 +0000
+++ lib/lp/bugs/stories/bugtask-searches/xx-advanced-people-filters.txt	2010-10-18 01:11:10 +0000
@@ -176,7 +176,7 @@
     >>> anon_browser.getControl('Bug subscriber').value = subscriber
     >>> anon_browser.getControl('Search', index=0).click()
     >>> print extract_text(find_main_content(anon_browser.contents))
-    Mozilla Firefox ...
+    Bugs in Mozilla Firefox ...
     No results for search
 
 We'll continue by subscribing the same user to a couple of bugs. However,

=== modified file 'lib/lp/bugs/templates/buglisting-default.pt'
--- lib/lp/bugs/templates/buglisting-default.pt	2010-10-06 22:05:15 +0000
+++ lib/lp/bugs/templates/buglisting-default.pt	2010-10-18 01:11:10 +0000
@@ -6,17 +6,18 @@
   metal:use-macro="view/macro:page/main_side"
   i18n:domain="malone"
 >
-  <body>
-
-  <metal:block fill-slot="head_epilogue">
-    <meta tal:condition="not: view/bug_tracking_usage/enumvalue:LAUNCHPAD"
-          name="robots" content="noindex,nofollow" />
-  </metal:block>
+
+<metal:block fill-slot="head_epilogue">
+  <meta condition="not: view/should_show_bug_information"
+        name="robots" content="noindex,nofollow" />
+</metal:block>
+
+<body>
 
   <div metal:fill-slot="main">
     <div tal:condition="not: view/bug_tracking_usage/enumvalue:UNKNOWN"
          class="top-portlet">
-      <tal:block condition="view/_projectContext">
+      <tal:is_project_group condition="view/_projectContext">
         <tal:block condition="view/required:launchpad.Edit">
           <p tal:condition="not: context/products" class="warning message">
             There are no projects registered for
@@ -27,66 +28,88 @@
             associate an existing project with it.
           </p>
         </tal:block>
-      </tal:block>
-      <h1
-        tal:condition="view/shouldShowAdvancedForm"
-        tal:content="view/getAdvancedSearchPageHeading"
-      >Bugs in Fooix: Advanced search</h1>
-
-      <tal:do_not_show_advanced_form
-        condition="not: view/shouldShowAdvancedForm">
-      <div tal:define="batch_navigator view/search">
-
-        <div metal:use-macro="context/@@+bugtarget-macros-search/simple-search-form"></div>
-        <tal:buglisting content="structure batch_navigator/@@+table-view" />
-      </div>
-      </tal:do_not_show_advanced_form>
-
-      <tal:show_advanced_form condition="view/shouldShowAdvancedForm">
-        <metal:advanced_form
-          use-macro="context/@@+bugtask-macros-tableview/advanced_search_form" />
-      </tal:show_advanced_form>
+
+        <tal:has_products condition="context/products">
+          <tal:no_bug_info condition="not:view/should_show_bug_information">
+            <p tal:define="name context/displayname">
+              <strong>
+                You cannot report a bug for <tal:name replace="name"/> as none
+                of the projects within the group use Launchpad for bug
+                tracking.  Please check the individual projects for details of
+                where bugs are reported.
+              </strong>
+            </p>
+            <p id="getting-started-help">
+              <a class="sprite maybe"
+                 href="https://help.launchpad.net/Bugs">Getting started
+                with bug tracking in Launchpad</a>.
+            </p>
+          </tal:no_bug_info>
+        </tal:has_products>
+      </tal:is_project_group>
+
+        <h1
+          tal:condition="view/shouldShowAdvancedForm"
+          tal:content="view/getAdvancedSearchPageHeading"
+        >Bugs in Fooix: Advanced search</h1>
+
+        <tal:do_not_show_advanced_form
+          condition="not: view/shouldShowAdvancedForm">
+          <div tal:define="batch_navigator view/search">
+            <div metal:use-macro="context/@@+bugtarget-macros-search/simple-search-form"></div>
+            <tal:buglisting content="structure batch_navigator/@@+table-view" />
+          </div>
+        </tal:do_not_show_advanced_form>
+
+        <tal:show_advanced_form condition="view/shouldShowAdvancedForm">
+          <metal:advanced_form
+             use-macro="context/@@+bugtask-macros-tableview/advanced_search_form" />
+        </tal:show_advanced_form>
+
+
     </div>
     <div tal:condition="view/bug_tracking_usage/enumvalue:UNKNOWN"
           class="top-portlet">
       <p>
-        <tal:displayname replace="context/displayname" />
-        does not use Launchpad for bug tracking.
+        <strong>
+          <tal:displayname replace="context/displayname" />
+          does not use Launchpad for bug tracking.
+        </strong>
       </p>
-      <p>
+      <p id="getting-started-help">
         <a class="sprite maybe"
           href="https://help.launchpad.net/Bugs">Getting started
         with bug tracking in Launchpad</a>.
       </p>
     </div>
   </div>
+
   <tal:side metal:fill-slot="side">
-    <div id="involvement" class="portlet involvement"
-      tal:condition="view/bug_tracking_usage/enumvalue:LAUNCHPAD">
-      <ul>
-        <li style="border: 0">
-          <a href="+filebug" class="menu-link-filebug sprite bugs">
-            Report a bug
-          </a>
-        </li>
-      </ul>
-    </div>
-    <tal:menu replace="structure view/@@+related-pages" />
-    <tal:do_not_show_portlets_advanced_form
-      condition="not: view/shouldShowAdvancedForm">
-      <tal:block content="structure context/@@+portlet-bugfilters"
-                 tal:condition="view/bug_tracking_usage/enumvalue:LAUNCHPAD"/>
-      <tal:block
-          content="structure context/@@+portlet-publishing-details | nothing"/>
-      <tal:block content="structure context/@@+portlet-bugtags"
-                 tal:condition="view/bug_tracking_usage/enumvalue:LAUNCHPAD"/>
-      <tal:releasecriticalbugs
+    <div id="bug-portlets" tal:condition="view/should_show_bug_information">
+      <div id="involvement" class="portlet involvement">
+        <ul>
+          <li style="border: 0">
+            <a href="+filebug" class="menu-link-filebug sprite bugs">
+              Report a bug
+            </a>
+          </li>
+        </ul>
+      </div>
+      <tal:menu replace="structure view/@@+related-pages" />
+      <tal:do_not_show_portlets_advanced_form
+        condition="not: view/shouldShowAdvancedForm">
+        <tal:block content="structure context/@@+portlet-bugfilters" />
+        <tal:block
+            content="structure context/@@+portlet-publishing-details | nothing"/>
+        <tal:block content="structure context/@@+portlet-bugtags"/>
+        <tal:releasecriticalbugs
+            tal:condition="view/shouldShowReleaseCriticalPortlet"
+            tal:content="structure context/@@+portlet-bugtasklist-seriesbugs" />
+        <tal:milestonecriticalbugs
           tal:condition="view/shouldShowReleaseCriticalPortlet"
-          tal:content="structure context/@@+portlet-bugtasklist-seriesbugs" />
-      <tal:milestonecriticalbugs
-        tal:condition="view/shouldShowReleaseCriticalPortlet"
-        tal:content="structure context/@@+portlet-bugtasklist-milestonebugs" />
-     </tal:do_not_show_portlets_advanced_form>
+          tal:content="structure context/@@+portlet-bugtasklist-milestonebugs" />
+       </tal:do_not_show_portlets_advanced_form>
+    </div>
   </tal:side>
 </body>
 

=== modified file 'lib/lp/soyuz/stories/packaging/package-pages-navigation.txt'
--- lib/lp/soyuz/stories/packaging/package-pages-navigation.txt	2010-05-19 05:47:50 +0000
+++ lib/lp/soyuz/stories/packaging/package-pages-navigation.txt	2010-10-18 01:11:10 +0000
@@ -39,7 +39,7 @@
     * Blueprints - not linked
     * Translations - not linked
     * Answers - http://answers.launchpad.dev/ubuntu/+source/alsa-utils
-    Main heading: (No main heading)
+    Main heading: Bugs in ?alsa-utils? package in Ubuntu
 
 
 == Distribution source package release ==
@@ -196,4 +196,3 @@
     * Translations - http://translations.launchpad.dev/ubuntu/hoary
     * Answers - not linked
     Main heading: pmount 0.1-1 (i386 binary) in ubuntu hoary
-

=== modified file 'lib/lp/testing/views.py'
--- lib/lp/testing/views.py	2010-09-19 03:09:49 +0000
+++ lib/lp/testing/views.py	2010-10-18 01:11:10 +0000
@@ -85,7 +85,8 @@
 def create_initialized_view(context, name, form=None, layer=None,
                             server_url=None, method=None, principal=None,
                             query_string=None, cookie=None, request=None,
-                            path_info='/', rootsite=None):
+                            path_info='/', rootsite=None,
+                            current_request=False):
     """Return a view that has already been initialized."""
     if method is None:
         if form is None:
@@ -94,7 +95,8 @@
             method = 'POST'
     view = create_view(
         context, name, form, layer, server_url, method, principal,
-        query_string, cookie, request, path_info, rootsite=rootsite)
+        query_string, cookie, request, path_info, rootsite=rootsite,
+        current_request=current_request)
     view.initialize()
     return view