Merge lp:~edwin-grubbs/launchpad/bug-635302-dsp-filebug-oops into lp:launchpad

[Edwin Grubbs]

Summary
-------

The bugs.lp.net/fedora/+source/$distributionsourcepackage page would display a list of
bugs and the "Report a bug" button despite the fact that the
distribution does not use Launchpad for tracking bugs.

Implementation details
----------------------

Added conditionals for hiding the bug listing and the "Report a bug"
button. It also sets robots=noindex,nofollow and displays a link to
help.lp.net/Bugs like bugtarget-bugs.pt does. However, I did not add a
link to configure the bugtracker, since buglisting-default.pt is used on
so many different objects, and the code would have to determine if the
object is part of a distribution or a project, which actually can have
its bugtracker configured.
    lib/lp/bugs/templates/buglisting-default.pt
    lib/lp/bugs/browser/bugtask.py

Adapt IDistributionSourcePackage/ISourcePackage to IServiceUsage and
reduce the zcml for the IBreadcrumb adapter.
    lib/lp/registry/browser/distributionsourcepackage.py
    lib/lp/registry/browser/sourcepackage.py
    lib/lp/registry/configure.zcml

Since buglisting-default.pt is also used by ProjectGroups, I made it
implement the IServiceUsage interface. This meant that the
browser.pillar.InvolvedMenu code could be simplified.
    lib/lp/registry/browser/pillar.py
    lib/lp/registry/interfaces/projectgroup.py
    lib/lp/registry/model/projectgroup.py

Fix tests by setting bug_tracking_usage to LAUNCHPAD. I also corrected
the indent of the python code in xx-distribution-statistics-portlet.txt.
    lib/lp/bugs/stories/bugtask-searches/xx-advanced-people-filters.txt
    lib/lp/bugs/stories/bugtask-searches/xx-advanced-upstream-pending-bugwatch.txt
    lib/lp/bugs/stories/bugtask-searches/xx-distribution-statistics-portlet.txt
    lib/lp/bugs/stories/bugtask-searches/xx-listing-basics.txt
    lib/lp/bugs/stories/bugtask-searches/xx-sort-orders.txt

Tests
-----

./bin/test -vv -t 'xx-advanced-people-filters.txt|xx-advanced-upstream-pending-bugwatch.txt|xx-distribution-statistics-portlet.txt|xx-listing-basics.txt|xx-sort-orders.txt'

Demo and Q/A
------------

* These pages should not show a list of bugs or the "Report a bug"
  button, but they should show the "Getting started with bug tracking in
  Launchpad" link.
    * Open http://launchpad.dev/debian/+source/mozilla-firefox
    * Open http://launchpad.dev/debian/sarge/+source/mozilla-firefox
    * Open http://launchpad.dev/apache
* These pages should show the bug listing and the "Report a bug" button.
    * Open http://launchpad.dev/ubuntu/+source/mozilla-firefox
    * Open http://launchpad.dev/ubuntu/warty/+source/mozilla-firefox
    * Open http://launchpad.dev/gnome

[Edwin Grubbs (edwin-grubbs)]

Here is a diff of a couple of files that I forgot to commit before.

=== added file 'lib/lp/bugs/browser/tests/test_buglisting.py'
--- lib/lp/bugs/browser/tests/test_buglisting.py 1970-01-01 00:00:00 +0000
+++ lib/lp/bugs/browser/tests/test_buglisting.py 2010-10-06 20:20:08 +0000
@@ -0,0 +1,71 @@
+# Copyright 2010 Canonical Ltd. This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+__metaclass__ = type
+
+from canonical.launchpad.testing.pages import (
+ extract_text,
+ find_tag_by_id,
+ find_tags_by_class,
+ )
+from canonical.launchpad.webapp import canonical_url
+from canonical.testing.layers import LaunchpadFunctionalLayer
+from lp.testing import BrowserTestCase
+
+
+class TestBugTaskSearchListingView(BrowserTestCase):
+
+ layer = LaunchpadFunctionalLayer
+
+ def _makeDistributionSourcePackage(self):
+ distro = self.factory.makeDistribution('test-distro')
+ return self.factory.makeDistributionSourcePackage('test-dsp', distro)
+
+ def test_distributionsourcepackage_unknown_bugtracker_message(self):
+ dsp = self._makeDistributionSourcePackage()
+ url = canonical_url(dsp, rootsite='bugs')
+ browser = self.getUserBrowser(url)
+ top_portlet = find_tags_by_class(
+ browser.contents, 'top-portlet')
+ self.assertTrue(len(top_portlet) > 0,
+ "Tag with class=top-portlet not found")
+ self.assertTextMatchesExpressionIgnoreWhitespace("""
+ test-dsp in test-distro does not use Launchpad for bug tracking.
+ Getting started with bug tracking in Launchpad.""",
+ extract_text(top_portlet[0]))
+
+ def test_distributionsourcepackage_unknown_bugtracker_no_button(self):
+ dsp = self._makeDistributionSourcePackage()
+ url = canonical_url(dsp, rootsite='bugs')
+ browser = self.getUserBrowser(url)
+ self.assertIs(None, find_tag_by_id(browser.contents, 'involvement'),
+ "Involvement portlet with Report-a-bug button should "
+ "not be shown")
+
+ def _makeSourcePackage(self):
+ distro = self.factory.makeDistribution('test-distro')
+ series = self.factory.makeDistroRelease(
+ distribution=distro, name='test-series')
+ return self.factory.makeSourcePackage('test-sp', distro.currentseries)
+
+ def test_sourcepackage_unknown_bugtracker_message(self):
+ sp = self._makeSourcePackage()
+ url = canonical_url(sp, rootsite='bugs')
+ browser = self.getUserBrowser(url)
+ top_portlet = find_tags_by_class(
+ browser.contents, 'top-portlet')
+ self.assertTrue(len(top_portlet) > 0,
+ "Tag with class=top-portlet not found")
+ self.assertTextMatchesExpressionIgnoreWhitespace("""
+ test-sp in Test-distro Test-series does not
+ use Launchpad for bug tracking.
+ Getting started with bug tracking in Launchpad.""",
+ extract_text(top_portlet[0]))
+
+ def test_sourcepackage_unknown_bugtracker_no_button(self):
+ sp = self._makeSourcePackage()
+ url...

[Curtis Hovey (sinzui)]

Hi Edwin.

This is a very nice refactoring and improvement to the rules.

There is some scary things in xx-distribution-statistics-portlet.txt, but I will ignore them since you it is unclear what the test is really doing. I think the bugs team should consider deleting it.

I believe you and Brad are solving the same PG issues. You may find you conflict with him. I like you refactoring and hope it is preserved.

I do not have any remarks about your code changes. You comments are clear. I do think something is missing though, and you should investigate why I get oopses when I merge your branch into a local branch:

https://bugs.launchpad.dev/debian/+source/mozilla-firefox
* I see a sidebar with links to do bug searches. I do not think this is correct. The links will show bugs that were reported under the assumption that the project did you LP.

https://launchpad.dev/apache
* OOPS
  Line 74, Column 8
  Expression: <PathExpr standard:u'context/@@+get-involved/answers_usage/enumvalue:LAUNCHPAD'>
  ForbiddenAttribute: ('official_malone', <ProjectGroup at 0xfd1b5ac>)<br />

https://launchpad.dev/gnome
* OOPS (same as above)

review: Needs Fixing (code and ui)

[Edwin Grubbs (edwin-grubbs)]

On Wed, Oct 6, 2010 at 4:35 PM, Curtis Hovey <email address hidden> wrote:
> Review: Needs Fixing code and ui
> Hi Edwin.
>
> This is a very nice refactoring and improvement to the rules.
>
> There is some scary things in xx-distribution-statistics-portlet.txt, but I will ignore them since you it is unclear what the test is really doing. I think the bugs team should consider deleting it.
>
> I believe you and Brad are solving the same PG issues. You may find you conflict with him. I like you refactoring and hope it is preserved.
>
> I do not have any remarks about your code changes. You comments are clear. I do think something is missing though, and you should investigate why I get oopses when I merge your branch into a local branch:
>
> https://bugs.launchpad.dev/debian/+source/mozilla-firefox
> * I see a sidebar with links to do bug searches. I do not think this is correct. The links will show bugs that were reported under the assumption that the project did you LP.

The portlet with bugfilter links is now hidden, and the bugtags
portlet is now also hidden.

> https://launchpad.dev/apache
> * OOPS
>  Line 74, Column 8
>  Expression: <PathExpr standard:u'context/@@+get-involved/answers_usage/enumvalue:LAUNCHPAD'>
>  ForbiddenAttribute: ('official_malone', <ProjectGroup at 0xfd1b5ac>)<br />
>
>
> https://launchpad.dev/gnome
> * OOPS (same as above)

Both of these are now fixed.

[Curtis Hovey (sinzui)]

Thanks for addressing my concerns. I think this branch is ready to land.

review: Approve (code + ui)

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2010-10-04 14:20:00 +0000
+++ lib/lp/bugs/browser/bugtask.py	2010-10-07 13:33:43 +0000
@@ -164,11 +164,6 @@
 from canonical.launchpad.webapp.interfaces import ILaunchBag
 from canonical.launchpad.webapp.launchpadform import ReturnToReferrerMixin
 from canonical.launchpad.webapp.menu import structured
-from lp.app.browser.tales import (
-    FormattersAPI,
-    ObjectImageDisplayAPI,
-    PersonFormatterAPI,
-    )
 from canonical.lazr.interfaces import IObjectPrivacy
 from canonical.lazr.utils import smartquote
 from canonical.widgets.bug import BugTagsWidget
@@ -189,11 +184,17 @@
     )
 from canonical.widgets.project import ProjectScopeWidget
 from lp.answers.interfaces.questiontarget import IQuestionTarget
+from lp.app.browser.tales import (
+    FormattersAPI,
+    ObjectImageDisplayAPI,
+    PersonFormatterAPI,
+    )
 from lp.app.enums import ServiceUsage
 from lp.app.errors import (
     NotFoundError,
     UnexpectedFormData,
     )
+from lp.app.interfaces.launchpad import IServiceUsage
 from lp.bugs.browser.bug import (
     BugContextMenu,
     BugTextView,
@@ -2484,6 +2485,15 @@
     custom_widget('tags_combinator', RadioWidget)
     custom_widget('component', LabeledMultiCheckBoxWidget)
 
+    @cachedproperty
+    def bug_tracking_usage(self):
+        """Whether the context tracks bugs in launchpad.
+
+        :returns: ServiceUsage enum value
+        """
+        service_usage = IServiceUsage(self.context)
+        return service_usage.bug_tracking_usage
+
     @property
     def schema(self):
         """Return the schema that defines the form."""

=== added file 'lib/lp/bugs/browser/tests/test_buglisting.py'
--- lib/lp/bugs/browser/tests/test_buglisting.py	1970-01-01 00:00:00 +0000
+++ lib/lp/bugs/browser/tests/test_buglisting.py	2010-10-07 13:33:43 +0000
@@ -0,0 +1,122 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+__metaclass__ = type
+
+from canonical.launchpad.testing.pages import (
+    extract_text,
+    find_tag_by_id,
+    find_tags_by_class,
+    )
+from canonical.launchpad.webapp import canonical_url
+from canonical.testing.layers import LaunchpadFunctionalLayer
+from lp.testing import BrowserTestCase
+
+
+class TestBugTaskSearchListingView(BrowserTestCase):
+
+    layer = LaunchpadFunctionalLayer
+
+    def _makeDistributionSourcePackage(self):
+        distro = self.factory.makeDistribution('test-distro')
+        return self.factory.makeDistributionSourcePackage('test-dsp', distro)
+
+    def test_distributionsourcepackage_unknown_bugtracker_message(self):
+        # A DistributionSourcePackage whose Distro does not use
+        # Launchpad for bug tracking should explain that.
+        dsp = self._makeDistributionSourcePackage()
+        url = canonical_url(dsp, rootsite='bugs')
+        browser = self.getUserBrowser(url)
+        top_portlet = find_tags_by_class(
+            browser.contents, 'top-portlet')
+        self.assertTrue(len(top_portlet) > 0,
+                        "Tag with class=top-portlet not found")
+        self.assertTextMatchesExpressionIgnoreWhitespace("""
+            test-dsp in test-distro does not use Launchpad for bug tracking.
+            Getting started with bug tracking in Launchpad.""",
+            extract_text(top_portlet[0]))
+
+    def test_distributionsourcepackage_unknown_bugtracker_no_button(self):
+        # A DistributionSourcePackage whose Distro does not use
+        # Launchpad for bug tracking should not show the "Report a bug"
+        # button.
+        dsp = self._makeDistributionSourcePackage()
+        url = canonical_url(dsp, rootsite='bugs')
+        browser = self.getUserBrowser(url)
+        self.assertIs(None, find_tag_by_id(browser.contents, 'involvement'),
+                      "Involvement portlet with Report-a-bug button should "
+                      "not be shown")
+
+    def test_distributionsourcepackage_unknown_bugtracker_no_filters(self):
+        # A DistributionSourcePackage whose Distro does not use
+        # Launchpad for bug tracking should not show links to "New
+        # bugs", "Open bugs", etc.
+        dsp = self._makeDistributionSourcePackage()
+        url = canonical_url(dsp, rootsite='bugs')
+        browser = self.getUserBrowser(url)
+        self.assertIs(None,
+                      find_tag_by_id(browser.contents, 'portlet-bugfilters'),
+                      "portlet-bugfilters should not be shown.")
+
+    def test_distributionsourcepackage_unknown_bugtracker_no_tags(self):
+        # A DistributionSourcePackage whose Distro does not use
+        # Launchpad for bug tracking should not show links to search by
+        # bug tags.
+        dsp = self._makeDistributionSourcePackage()
+        url = canonical_url(dsp, rootsite='bugs')
+        browser = self.getUserBrowser(url)
+        self.assertIs(None, find_tag_by_id(browser.contents, 'portlet-tags'),
+                      "portlet-tags should not be shown.")
+
+    def _makeSourcePackage(self):
+        distro = self.factory.makeDistribution('test-distro')
+        series = self.factory.makeDistroRelease(
+            distribution=distro, name='test-series')
+        return self.factory.makeSourcePackage('test-sp', distro.currentseries)
+
+    def test_sourcepackage_unknown_bugtracker_message(self):
+        # A SourcePackage whose Distro does not use
+        # Launchpad for bug tracking should explain that.
+        sp = self._makeSourcePackage()
+        url = canonical_url(sp, rootsite='bugs')
+        browser = self.getUserBrowser(url)
+        top_portlet = find_tags_by_class(
+            browser.contents, 'top-portlet')
+        self.assertTrue(len(top_portlet) > 0,
+                        "Tag with class=top-portlet not found")
+        self.assertTextMatchesExpressionIgnoreWhitespace("""
+            test-sp in Test-distro Test-series does not
+            use Launchpad for bug tracking.
+            Getting started with bug tracking in Launchpad.""",
+            extract_text(top_portlet[0]))
+
+    def test_sourcepackage_unknown_bugtracker_no_button(self):
+        # A SourcePackage whose Distro does not use Launchpad for bug
+        # tracking should not show the "Report a bug" button.
+        sp = self._makeSourcePackage()
+        url = canonical_url(sp, rootsite='bugs')
+        browser = self.getUserBrowser(url)
+        self.assertIs(None, find_tag_by_id(browser.contents, 'involvement'),
+                      "Involvement portlet with Report-a-bug button should "
+                      "not be shown")
+
+    def test_sourcepackage_unknown_bugtracker_no_filters(self):
+        # A SourcePackage whose Distro does not use Launchpad for bug
+        # tracking should not show links to "New bugs", "Open bugs",
+        # etc.
+        sp = self._makeSourcePackage()
+        url = canonical_url(sp, rootsite='bugs')
+        browser = self.getUserBrowser(url)
+        self.assertIs(None,
+                      find_tag_by_id(browser.contents, 'portlet-bugfilters'),
+                      "portlet-bugfilters should not be shown.")
+
+    def test_sourcepackage_unknown_bugtracker_no_tags(self):
+        # A SourcePackage whose Distro does not use Launchpad for bug
+        # tracking should not show links to search by bug tags.
+        sp = self._makeSourcePackage()
+        url = canonical_url(sp, rootsite='bugs')
+        browser = self.getUserBrowser(url)
+        self.assertIs(None,
+                      find_tag_by_id(browser.contents, 'portlet-tags'),
+                      "portlet-tags should not be shown.")

=== 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-06-12 05:14:55 +0000
+++ lib/lp/bugs/stories/bugtask-searches/xx-advanced-people-filters.txt	2010-10-07 13:33:43 +0000
@@ -28,6 +28,10 @@
 Let's test the advanced form for a distribution.  We get the search
 results when we use a valid assignee.
 
+    >>> # Debian must enable the Launchpad bug tracker to access bugs.
+    >>> 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?advanced=1')
     >>> anon_browser.getControl(name='field.assignee').value = 'name12'
     >>> anon_browser.getControl('Search', index=0).click()

=== modified file 'lib/lp/bugs/stories/bugtask-searches/xx-advanced-upstream-pending-bugwatch.txt'
--- lib/lp/bugs/stories/bugtask-searches/xx-advanced-upstream-pending-bugwatch.txt	2010-06-12 14:30:43 +0000
+++ lib/lp/bugs/stories/bugtask-searches/xx-advanced-upstream-pending-bugwatch.txt	2010-10-07 13:33:43 +0000
@@ -37,6 +37,11 @@
 chooses to search for all bugs that need to be forwarded upstream.
 He sees one match.
 
+    >>> # alsa-utils must use an external bugtracker to view bugs
+    >>> # forwarded to an upstream.
+    >>> from lp.testing.service_usage_helpers import set_service_usage
+    >>> set_service_usage('alsa-utils', bug_tracking_usage='EXTERNAL')
+
     >>> browser.open('http://bugs.launchpad.dev/alsa-utils/+bugs?advanced=1')
     >>> pending_bugwatch_label = (
     ...     'Show bugs that need to be forwarded to an upstream '

=== modified file 'lib/lp/bugs/stories/bugtask-searches/xx-distribution-statistics-portlet.txt'
--- lib/lp/bugs/stories/bugtask-searches/xx-distribution-statistics-portlet.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/stories/bugtask-searches/xx-distribution-statistics-portlet.txt	2010-10-07 13:33:43 +0000
@@ -7,45 +7,49 @@
 
 Viewing critical bugs as Sample Person:
 
-  >>> print http(r"""
-  ... GET /debian/+bugs?field.status%3Alist=New&field.status%3Alist=Confirmed&field.importance%3Alist=Critical&search=Search HTTP/1.1
-  ... Authorization: Basic dGVzdEBjYW5vbmljYWwuY29tOnRlc3Q=
-  ... """)
-  HTTP/1.1 200 Ok
-  ...No results for search...
+    >>> # Debian must enable the Launchpad bug tracker to access bugs.
+    >>> from lp.testing.service_usage_helpers import set_service_usage
+    >>> set_service_usage('debian', bug_tracking_usage='LAUNCHPAD')
+
+    >>> print http(r"""
+    ... GET /debian/+bugs?field.status%3Alist=New&field.status%3Alist=Confirmed&field.importance%3Alist=Critical&search=Search HTTP/1.1
+    ... Authorization: Basic dGVzdEBjYW5vbmljYWwuY29tOnRlc3Q=
+    ... """)
+    HTTP/1.1 200 Ok
+    ...No results for search...
 
 Viewing bugs "assigned to me", as Sample Person:
 
-  >>> print http(r"""
-  ... GET /debian/+bugs?field.status%3Alist=New&field.status%3Alist=Confirmed&field.assignee=name12&search=Search HTTP/1.1
-  ... Authorization: Basic dGVzdEBjYW5vbmljYWwuY29tOnRlc3Q=
-  ... """)
-  HTTP/1.1 200 Ok
-  ...1 result...
+    >>> print http(r"""
+    ... GET /debian/+bugs?field.status%3Alist=New&field.status%3Alist=Confirmed&field.assignee=name12&search=Search HTTP/1.1
+    ... Authorization: Basic dGVzdEBjYW5vbmljYWwuY29tOnRlc3Q=
+    ... """)
+    HTTP/1.1 200 Ok
+    ...1 result...
 
 Viewing untriaged bugs as Sample Person:
 
-  >>> print http(r"""
-  ... GET /debian/+bugs?field.status%3Alist=New&search=Search HTTP/1.1
-  ... Authorization: Basic dGVzdEBjYW5vbmljYWwuY29tOnRlc3Q=
-  ... """)
-  HTTP/1.1 200 Ok
-  ...1 result...
+    >>> print http(r"""
+    ... GET /debian/+bugs?field.status%3Alist=New&search=Search HTTP/1.1
+    ... Authorization: Basic dGVzdEBjYW5vbmljYWwuY29tOnRlc3Q=
+    ... """)
+    HTTP/1.1 200 Ok
+    ...1 result...
 
 Viewing unassigned bugs as Sample Person:
 
-  >>> print http(r"""
-  ... GET /debian/+bugs?field.status%3Alist=New&field.status%3Alist=Confirmed&field.status-empty-marker=1&field.importance-empty-marker=1&field.assignee=&assignee_option=none&search=Search HTTP/1.1
-  ... Authorization: Basic dGVzdEBjYW5vbmljYWwuY29tOnRlc3Q=
-  ... """)
-  HTTP/1.1 200 Ok
-  ...2 results...
+    >>> print http(r"""
+    ... GET /debian/+bugs?field.status%3Alist=New&field.status%3Alist=Confirmed&field.status-empty-marker=1&field.importance-empty-marker=1&field.assignee=&assignee_option=none&search=Search HTTP/1.1
+    ... Authorization: Basic dGVzdEBjYW5vbmljYWwuY29tOnRlc3Q=
+    ... """)
+    HTTP/1.1 200 Ok
+    ...2 results...
 
 Viewing open reported bugs as Sample Person:
 
-  >>> print http(r"""
-  ... GET /debian/+bugs?search=Search HTTP/1.1
-  ... Authorization: Basic dGVzdEBjYW5vbmljYWwuY29tOnRlc3Q=
-  ... """)
-  HTTP/1.1 200 Ok
-  ...3 results...
+    >>> print http(r"""
+    ... GET /debian/+bugs?search=Search HTTP/1.1
+    ... Authorization: Basic dGVzdEBjYW5vbmljYWwuY29tOnRlc3Q=
+    ... """)
+    HTTP/1.1 200 Ok
+    ...3 results...

=== modified file 'lib/lp/bugs/stories/bugtask-searches/xx-listing-basics.txt'
--- lib/lp/bugs/stories/bugtask-searches/xx-listing-basics.txt	2010-10-03 15:30:06 +0000
+++ lib/lp/bugs/stories/bugtask-searches/xx-listing-basics.txt	2010-10-07 13:33:43 +0000
@@ -14,6 +14,10 @@
 
 Bug listings default to open bugtasks:
 
+    >>> # Debian must enable the Launchpad bug tracker to access bugs.
+    >>> from lp.testing.service_usage_helpers import set_service_usage
+    >>> set_service_usage('debian', bug_tracking_usage='LAUNCHPAD')
+
     >>> user_browser.open('http://launchpad.dev/debian/+bugs')
     >>> print_bugtasks(user_browser.contents)
     3 Bug Title Test mozilla-firefox Unknown New
@@ -31,6 +35,7 @@
 
 An anonymous user views the bug tasks in upstream Ubuntu.
 
+    >>> set_service_usage('tomcat', bug_tracking_usage='LAUNCHPAD')
     >>> anon_browser.open("http://launchpad.dev/tomcat/+bugs")
     >>> print_bugtasks(anon_browser.contents)
     2 Blackhole Trash folder Low New
@@ -179,6 +184,7 @@
 Similarly, if we don't do a search and there are no open bugs on that product,
 it'll say so.
 
+    >>> set_service_usage('iso-codes', bug_tracking_usage='LAUNCHPAD')
     >>> user_browser.open("http://launchpad.dev/iso-codes/+bugs")
     >>> print user_browser.contents
     <...

=== modified file 'lib/lp/bugs/stories/bugtask-searches/xx-sort-orders.txt'
--- lib/lp/bugs/stories/bugtask-searches/xx-sort-orders.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/stories/bugtask-searches/xx-sort-orders.txt	2010-10-07 13:33:43 +0000
@@ -33,6 +33,10 @@
 
 Default view:
 
+    >>> # Debian must enable the Launchpad bug tracker to access bugs.
+    >>> from lp.testing.service_usage_helpers import set_service_usage
+    >>> set_service_usage('debian', bug_tracking_usage='LAUNCHPAD')
+
     >>> anon_browser.open("http://launchpad.dev/debian/+bugs")
     >>> print_bugtasks(anon_browser.contents)
     3 Bug Title Test

=== modified file 'lib/lp/bugs/templates/buglisting-default.pt'
--- lib/lp/bugs/templates/buglisting-default.pt	2009-09-16 17:05:13 +0000
+++ lib/lp/bugs/templates/buglisting-default.pt	2010-10-07 13:33:43 +0000
@@ -8,8 +8,14 @@
 >
   <body>
 
+  <metal:block fill-slot="head_epilogue">
+    <meta tal:condition="not: view/bug_tracking_usage/enumvalue:LAUNCHPAD"
+          name="robots" content="noindex,nofollow" />
+  </metal:block>
+
   <div metal:fill-slot="main">
-    <div class="top-portlet">
+    <div tal:condition="not: view/bug_tracking_usage/enumvalue:UNKNOWN"
+         class="top-portlet">
       <tal:block condition="view/_projectContext">
         <tal:block condition="view/required:launchpad.Edit">
           <p tal:condition="not: context/products" class="warning message">
@@ -31,7 +37,7 @@
         condition="not: view/shouldShowAdvancedForm">
       <div tal:define="batch_navigator view/search">
 
-        <div metal:use-macro="context/@@+bugtarget-macros-search/simple-search-form" />
+        <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>
@@ -41,9 +47,22 @@
           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.
+      </p>
+      <p>
+        <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">
+    <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">
@@ -55,10 +74,12 @@
     <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-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:block content="structure context/@@+portlet-bugtags"
+                 tal:condition="view/bug_tracking_usage/enumvalue:LAUNCHPAD"/>
       <tal:releasecriticalbugs
           tal:condition="view/shouldShowReleaseCriticalPortlet"
           tal:content="structure context/@@+portlet-bugtasklist-seriesbugs" />

=== modified file 'lib/lp/registry/browser/distributionsourcepackage.py'
--- lib/lp/registry/browser/distributionsourcepackage.py	2010-09-27 16:49:22 +0000
+++ lib/lp/registry/browser/distributionsourcepackage.py	2010-10-07 13:33:43 +0000
@@ -4,14 +4,15 @@
 __metaclass__ = type
 
 __all__ = [
+    'distribution_from_distributionsourcepackage',
     'DistributionSourcePackageBreadcrumb',
+    'DistributionSourcePackageChangelogView',
     'DistributionSourcePackageEditView',
     'DistributionSourcePackageFacets',
     'DistributionSourcePackageNavigation',
     'DistributionSourcePackageOverviewMenu',
+    'DistributionSourcePackagePublishingHistoryView',
     'DistributionSourcePackageView',
-    'DistributionSourcePackageChangelogView',
-    'DistributionSourcePackagePublishingHistoryView',
     ]
 
 from datetime import datetime
@@ -20,12 +21,17 @@
 
 from lazr.delegates import delegates
 import pytz
-from zope.component import getUtility
+from zope.component import (
+    adapter,
+    getUtility,
+    )
 from zope.interface import (
+    implementer,
     implements,
     Interface,
     )
 
+from canonical.launchpad.webapp.interfaces import IBreadcrumb
 from canonical.launchpad.helpers import shortlist
 from canonical.launchpad.webapp import (
     action,
@@ -44,6 +50,7 @@
     NavigationMenu,
     )
 from canonical.launchpad.webapp.sorting import sorted_dotted_numbers
+from lp.app.interfaces.launchpad import IServiceUsage
 from lp.app.browser.tales import CustomizableFormatter
 from canonical.lazr.utils import smartquote
 from lp.answers.browser.questiontarget import (
@@ -88,8 +95,10 @@
         return {'displayname': displayname}
 
 
+@adapter(IDistributionSourcePackage)
 class DistributionSourcePackageBreadcrumb(Breadcrumb):
     """Builds a breadcrumb for an `IDistributionSourcePackage`."""
+    implements(IBreadcrumb)
 
     @property
     def text(self):
@@ -97,6 +106,12 @@
             self.context.sourcepackagename.name)
 
 
+@adapter(IDistributionSourcePackage)
+@implementer(IServiceUsage)
+def distribution_from_distributionsourcepackage(dsp):
+    return dsp.distribution
+
+
 class DistributionSourcePackageFacets(QuestionTargetFacetMixin,
                                       StandardLaunchpadFacets):
 

=== modified file 'lib/lp/registry/browser/pillar.py'
--- lib/lp/registry/browser/pillar.py	2010-10-06 19:44:28 +0000
+++ lib/lp/registry/browser/pillar.py	2010-10-07 13:33:43 +0000
@@ -31,8 +31,8 @@
     )
 from lp.app.browser.tales import MenuAPI
 from lp.app.enums import (
+    service_uses_launchpad,
     ServiceUsage,
-    service_uses_launchpad,
     )
 from lp.app.interfaces.launchpad import IServiceUsage
 from lp.registry.browser.structuralsubscription import (
@@ -113,34 +113,33 @@
         self.translations_usage = ServiceUsage.UNKNOWN
         self.codehosting_usage = ServiceUsage.UNKNOWN
         pillar = nearest(self.context, IPillar)
-        if IProjectGroup.providedBy(pillar):
-            for product in pillar.products:
-                self._set_official_launchpad(product)
+
+        self._set_official_launchpad(pillar)
+        if IDistroSeries.providedBy(self.context):
+            distribution = self.context.distribution
+            self.codehosting_usage = distribution.codehosting_usage
+            self.answers_usage = ServiceUsage.NOT_APPLICABLE
+        elif IDistributionSourcePackage.providedBy(self.context):
+            self.blueprints_usage = ServiceUsage.UNKNOWN
+            self.translations_usage = ServiceUsage.UNKNOWN
+        elif IProjectGroup.providedBy(pillar):
+            # XXX: 2010-10-07 EdwinGrubbs bug=656292
+            # Fix _set_official_launchpad().
+
             # Project groups do not support submit code, override the
             # default.
             self.codehosting_usage = ServiceUsage.NOT_APPLICABLE
-            # Product groups must have translatable products for
-            # translations_usage to be ServiceUsage.LAUNCHPAD
-            if not pillar.has_translatable():
-                self.translations_usage = ServiceUsage.UNKNOWN
         else:
-            self._set_official_launchpad(pillar)
-            if IDistroSeries.providedBy(self.context):
-                distribution = self.context.distribution
-                self.codehosting_usage = distribution.codehosting_usage
-                self.answers_usage = ServiceUsage.NOT_APPLICABLE
-            elif IDistributionSourcePackage.providedBy(self.context):
-                self.blueprints_usage = ServiceUsage.UNKNOWN
-                self.translations_usage = ServiceUsage.UNKNOWN
-            else:
-                # The context is used by all apps.
-                pass
+            # The context is used by all apps.
+            pass
 
     def _set_official_launchpad(self, pillar):
         """Does the pillar officially use launchpad."""
+        # XXX: 2010-10-07 EdwinGrubbs bug=656292
+        # Fix _set_official_launchpad().
         # This if structure is required because it may be called many
         # times to build the complete set of official applications.
-        if pillar.official_malone:
+        if service_uses_launchpad(IServiceUsage(pillar).bug_tracking_usage):
             self.official_malone = True
         if service_uses_launchpad(IServiceUsage(pillar).answers_usage):
             self.answers_usage = ServiceUsage.LAUNCHPAD

=== modified file 'lib/lp/registry/browser/sourcepackage.py'
--- lib/lp/registry/browser/sourcepackage.py	2010-09-29 00:17:32 +0000
+++ lib/lp/registry/browser/sourcepackage.py	2010-10-07 13:33:43 +0000
@@ -27,11 +27,16 @@
 from zope.app.form.browser import DropdownWidget
 from zope.app.form.interfaces import IInputWidget
 from zope.component import (
+    adapter,
     getMultiAdapter,
     getUtility,
     )
 from zope.formlib.form import Fields
-from zope.interface import Interface
+from zope.interface import (
+    implementer,
+    implements,
+    Interface,
+    )
 from zope.schema import (
     Choice,
     TextLine,
@@ -42,10 +47,12 @@
     SimpleVocabulary,
     )
 
+from canonical.launchpad.webapp.interfaces import IBreadcrumb
 from canonical.launchpad import (
     _,
     helpers,
     )
+from lp.app.interfaces.launchpad import IServiceUsage
 from lp.app.browser.tales import CustomizableFormatter
 from canonical.launchpad.browser.multistep import (
     MultiStepView,
@@ -170,8 +177,16 @@
         return redirection(redirection_url)
 
 
+@adapter(ISourcePackage)
+@implementer(IServiceUsage)
+def distribution_from_sourcepackage(package):
+    return package.distribution
+
+
+@adapter(ISourcePackage)
 class SourcePackageBreadcrumb(Breadcrumb):
     """Builds a breadcrumb for an `ISourcePackage`."""
+    implements(IBreadcrumb)
 
     @property
     def text(self):

=== modified file 'lib/lp/registry/configure.zcml'
--- lib/lp/registry/configure.zcml	2010-10-04 20:46:55 +0000
+++ lib/lp/registry/configure.zcml	2010-10-07 13:33:43 +0000
@@ -498,10 +498,9 @@
         provides="canonical.launchpad.webapp.interfaces.ILaunchpadContainer"
         factory="canonical.launchpad.components.launchpadcontainer.LaunchpadDistributionSourcePackageContainer"/>
     <adapter
-        provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
-        for="lp.registry.interfaces.distributionsourcepackage.IDistributionSourcePackage"
-        factory="lp.registry.browser.distributionsourcepackage.DistributionSourcePackageBreadcrumb"
-        permission="zope.Public"/>
+        factory="lp.registry.browser.distributionsourcepackage.distribution_from_distributionsourcepackage"/>
+    <adapter
+        factory="lp.registry.browser.distributionsourcepackage.DistributionSourcePackageBreadcrumb"/>
 
     <!-- CommercialSubscription -->
 
@@ -1615,10 +1614,9 @@
             interface="lp.registry.interfaces.sourcepackage.ISourcePackageFactory"/>
     </securedutility>
     <adapter
-        provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
-        for="lp.registry.interfaces.sourcepackage.ISourcePackage"
-        factory="lp.registry.browser.sourcepackage.SourcePackageBreadcrumb"
-        permission="zope.Public"/>
+        factory="lp.registry.browser.sourcepackage.SourcePackageBreadcrumb"/>
+    <adapter
+        factory="lp.registry.browser.sourcepackage.distribution_from_sourcepackage"/>
 
     <!-- This is class ProductReleaseSet -->
 

=== modified file 'lib/lp/registry/interfaces/projectgroup.py'
--- lib/lp/registry/interfaces/projectgroup.py	2010-10-06 19:44:28 +0000
+++ lib/lp/registry/interfaces/projectgroup.py	2010-10-07 13:33:43 +0000
@@ -51,6 +51,7 @@
     )
 from canonical.launchpad.validators.name import name_validator
 from lp.app.interfaces.headings import IRootContext
+from lp.app.interfaces.launchpad import IServiceUsage
 from lp.blueprints.interfaces.specificationtarget import IHasSpecifications
 from lp.blueprints.interfaces.sprint import IHasSprints
 from lp.bugs.interfaces.bugtarget import (
@@ -111,7 +112,7 @@
     IHasDrivers, IHasBranchVisibilityPolicy, IHasIcon, IHasLogo,
     IHasMentoringOffers, IHasMergeProposals, IHasMilestones, IHasMugshot,
     IHasOwner, IHasSpecifications, IHasSprints, IMakesAnnouncements,
-    IKarmaContext, IRootContext, IHasOfficialBugTags):
+    IKarmaContext, IRootContext, IHasOfficialBugTags, IServiceUsage):
     """Public IProjectGroup properties."""
 
     id = Int(title=_('ID'), readonly=True)

=== modified file 'lib/lp/registry/model/projectgroup.py'
--- lib/lp/registry/model/projectgroup.py	2010-10-06 19:44:28 +0000
+++ lib/lp/registry/model/projectgroup.py	2010-10-07 13:33:43 +0000
@@ -52,6 +52,7 @@
     FAQSearch,
     )
 from lp.answers.model.question import QuestionTargetSearch
+from lp.app.enums import ServiceUsage
 from lp.app.errors import NotFoundError
 from lp.blueprints.interfaces.specification import (
     SpecificationFilter,
@@ -492,6 +493,56 @@
 
         return ProjectGroupSeries(self, series_name)
 
+    def _get_usage(self, attr):
+        """Determine ProjectGroup usage based on individual projects.
+
+        By default, return ServiceUsage.UNKNOWN.
+        If any project uses Launchpad, return ServiceUsage.LAUNCHPAD.
+        Otherwise, return the ServiceUsage of the last project that was
+        not ServiceUsage.UNKNOWN.
+        """
+        result = ServiceUsage.UNKNOWN
+        for product in self.products:
+            product_usage = getattr(product, attr)
+            if product_usage != ServiceUsage.UNKNOWN:
+                result = product_usage
+                if product_usage == ServiceUsage.LAUNCHPAD:
+                    break
+        return result
+
+    @property
+    def answers_usage(self):
+        return self._get_usage('answers_usage')
+
+    @property
+    def blueprints_usage(self):
+        return self._get_usage('blueprints_usage')
+
+    @property
+    def translations_usage(self):
+        if self.has_translatable():
+            return ServiceUsage.LAUNCHPAD
+        return ServiceUsage.UNKNOWN
+
+    @property
+    def codehosting_usage(self):
+        # Project groups do not support submitting code.
+        return ServiceUsage.NOT_APPLICABLE
+
+    @property
+    def bug_tracking_usage(self):
+        return self._get_usage('bug_tracking_usage')
+
+    @property
+    def uses_launchpad(self):
+        if (self.answers_usage == ServiceUsage.LAUNCHPAD
+            or self.blueprints_usage == ServiceUsage.LAUNCHPAD
+            or self.translations_usage == ServiceUsage.LAUNCHPAD
+            or self.codehosting_usage == ServiceUsage.LAUNCHPAD
+            or self.bug_tracking_usage == ServiceUsage.LAUNCHPAD):
+            return True
+        return False
+
 
 class ProjectGroupSet:
     implements(IProjectGroupSet)

=== added file 'lib/lp/testing/service_usage_helpers.py'
--- lib/lp/testing/service_usage_helpers.py	1970-01-01 00:00:00 +0000
+++ lib/lp/testing/service_usage_helpers.py	2010-10-07 13:33:43 +0000
@@ -0,0 +1,33 @@
+# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Helper functions dealing with IServiceUsage."""
+__metaclass__ = type
+
+import transaction
+from zope.component import getUtility
+
+from lp.app.enums import ServiceUsage
+from lp.registry.interfaces.pillar import IPillarNameSet
+from lp.testing import (
+    login,
+    logout,
+    )
+from lp.testing.factory import LaunchpadObjectFactory
+from lp.testing.sampledata import ADMIN_EMAIL
+
+
+def set_service_usage(pillar_name, **kw):
+    factory = LaunchpadObjectFactory()
+    login(ADMIN_EMAIL)
+    pillar = getUtility(IPillarNameSet)[pillar_name]
+    for attr, service_usage_name in kw.items():
+        service_usage = getattr(ServiceUsage, service_usage_name)
+        if attr == 'bug_tracking_usage':
+            pillar.official_malone = (service_usage == ServiceUsage.LAUNCHPAD)
+            if service_usage == ServiceUsage.EXTERNAL:
+                pillar.bugtracker = factory.makeBugTracker()
+        else:
+            setattr(pillar, attr, service_usage)
+    #transaction.commit()
+    logout()