Merge lp:~salgado/launchpad/cleanup-breadcrumbs into lp:launchpad

[Guilherme Salgado]

[Guilherme Salgado (salgado)]

= Summary =

Most of our IBreadcrumb adapters define just a text property that
returns the context's title or displayname, so I defined some generic
adapters that do just that and used them instead, removing the existing
ones.

The field_names variable removed is because it was redefined a few lines
below. Also, the lint issues on browser/person.py have been fixed on
another branch of mine, so I won't fix them here.

== Tests ==

./bin/test -vvt test_breadcrumbs

== Demo and Q/A ==

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/bugs/configure.zcml
  lib/lp/registry/browser/product.py
  lib/lp/registry/configure.zcml
  lib/canonical/launchpad/webapp/breadcrumb.py
  lib/lp/soyuz/configure.zcml
  lib/lp/blueprints/configure.zcml
  lib/lp/blueprints/browser/sprint.py
  lib/lp/bugs/browser/bugtracker.py
  lib/lp/soyuz/browser/builder.py
  lib/lp/translations/configure.zcml
  lib/lp/translations/browser/translationgroup.py
  lib/lp/registry/browser/person.py
  lib/lp/registry/browser/distribution.py
  lib/lp/registry/browser/project.py
  lib/lp/soyuz/browser/archive.py

== Pylint notices ==

lib/lp/registry/browser/product.py
    54: [F0401] Unable to import 'lazr.delegates' (No module named delegates)

lib/lp/soyuz/browser/builder.py
    44: [F0401] Unable to import 'lazr.delegates' (No module named delegates)

lib/lp/registry/browser/person.py
    1186: [C0301] Line too long (79/78)
    1273: [C0301] Line too long (79/78)
    3120: [W0311] Bad indentation. Found 10 spaces, expected 12
    3124: [W0311] Bad indentation. Found 10 spaces, expected 12
    119: [F0401] Unable to import 'lazr.delegates' (No module named delegates)
    120: [F0401] Unable to import 'lazr.config' (No module named config)
    121: [F0401] Unable to import 'lazr.restful.interface' (No module named restful)

[Celso Providelo (cprov)]

Cool! Very nice change, Salgado.

review: Approve (code)

=== modified file 'lib/canonical/launchpad/webapp/breadcrumb.py'
--- lib/canonical/launchpad/webapp/breadcrumb.py	2009-08-31 17:40:56 +0000
+++ lib/canonical/launchpad/webapp/breadcrumb.py	2009-09-03 15:04:13 +0000
@@ -7,6 +7,8 @@
 
 __all__ = [
     'Breadcrumb',
+    'DisplaynameBreadcrumb',
+    'TitleBreadcrumb',
     ]
 
 
@@ -67,3 +69,19 @@
 
         return "<%s url='%s' text='%s'%s>" % (
             self.__class__.__name__, self.url, self.text, icon_repr)
+
+
+class DisplaynameBreadcrumb(Breadcrumb):
+    """An `IBreadcrumb` that uses the context's displayname as its text."""
+
+    @property
+    def text(self):
+        return self.context.displayname
+
+
+class TitleBreadcrumb(Breadcrumb):
+    """An `IBreadcrumb` that uses the context's title as its text."""
+
+    @property
+    def text(self):
+        return self.context.title

=== modified file 'lib/lp/blueprints/browser/sprint.py'
--- lib/lp/blueprints/browser/sprint.py	2009-08-29 03:38:28 +0000
+++ lib/lp/blueprints/browser/sprint.py	2009-09-03 15:04:13 +0000
@@ -8,7 +8,6 @@
     'SprintAddView',
     'SprintAttendeesCsvExportView',
     'SprintBrandingView',
-    'SprintBreadcrumb',
     'SprintEditView',
     'SprintFacets',
     'SprintMeetingExportView',
@@ -70,13 +69,6 @@
     usedfor = ISprint
 
 
-class SprintBreadcrumb(Breadcrumb):
-    """Builds a breadcrumb for an `ISprint`."""
-    @property
-    def text(self):
-        return self.context.title
-
-
 class SprintOverviewMenu(ApplicationMenu):
 
     usedfor = ISprint

=== modified file 'lib/lp/blueprints/configure.zcml'
--- lib/lp/blueprints/configure.zcml	2009-08-24 20:28:33 +0000
+++ lib/lp/blueprints/configure.zcml	2009-09-03 15:04:13 +0000
@@ -28,7 +28,7 @@
     <adapter
         provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
         for="lp.blueprints.interfaces.sprint.ISprint"
-        factory="lp.blueprints.browser.sprint.SprintBreadcrumb"
+        factory="canonical.launchpad.webapp.breadcrumb.TitleBreadcrumb"
         permission="zope.Public"/>
     <adapter
         provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"

=== modified file 'lib/lp/bugs/browser/bugtracker.py'
--- lib/lp/bugs/browser/bugtracker.py	2009-08-24 20:28:33 +0000
+++ lib/lp/bugs/browser/bugtracker.py	2009-09-03 15:04:13 +0000
@@ -7,7 +7,6 @@
 
 __all__ = [
     'BugTrackerAddView',
-    'BugTrackerBreadcrumb',
     'BugTrackerContextMenu',
     'BugTrackerEditView',
     'BugTrackerNavigation',
@@ -41,7 +40,6 @@
     redirection, structured)
 from canonical.launchpad.webapp.authorization import check_permission
 from canonical.launchpad.webapp.batching import BatchNavigator
-from canonical.launchpad.webapp.breadcrumb import Breadcrumb
 from canonical.widgets import DelimitedListWidget, LaunchpadRadioWidget
 
 
@@ -194,10 +192,6 @@
 class BugTrackerEditView(LaunchpadEditFormView):
 
     schema = IBugTracker
-    field_names = ['name', 'title', 'bugtrackertype',
-                   'summary', 'baseurl', 'aliases', 'contactdetails',
-                   'active']
-
     custom_widget('summary', TextAreaWidget, width=30, height=5)
     custom_widget('aliases', DelimitedListWidget, height=3)
     custom_widget('active', LaunchpadRadioWidget, orientation='vertical')
@@ -379,13 +373,6 @@
             return RemoteBug(self.context, remotebug, bugs)
 
 
-class BugTrackerBreadcrumb(Breadcrumb):
-    """Builds a breadcrumb for an `IBugTracker`."""
-    @property
-    def text(self):
-        return self.context.title
-
-
 class RemoteBug:
     """Represents a bug in a remote bug tracker."""
 

=== modified file 'lib/lp/bugs/configure.zcml'
--- lib/lp/bugs/configure.zcml	2009-08-25 13:51:39 +0000
+++ lib/lp/bugs/configure.zcml	2009-09-03 15:04:13 +0000
@@ -384,7 +384,7 @@
         <adapter
             provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
             for="lp.bugs.interfaces.bugtracker.IBugTracker"
-            factory="lp.bugs.browser.bugtracker.BugTrackerBreadcrumb"
+            factory="canonical.launchpad.webapp.breadcrumb.TitleBreadcrumb"
             permission="zope.Public"/>
         
         <!-- BugTrackerSet -->

=== modified file 'lib/lp/registry/browser/distribution.py'
--- lib/lp/registry/browser/distribution.py	2009-09-02 05:37:54 +0000
+++ lib/lp/registry/browser/distribution.py	2009-09-03 15:04:13 +0000
@@ -11,7 +11,6 @@
     'DistributionArchiveMirrorsRSSView',
     'DistributionArchiveMirrorsView',
     'DistributionArchivesView',
-    'DistributionBreadcrumb',
     'DistributionChangeMembersView',
     'DistributionChangeMirrorAdminView',
     'DistributionCountryArchiveMirrorsView',
@@ -172,13 +171,6 @@
         return self.redirectSubTree(canonical_url(distribution))
 
 
-class DistributionBreadcrumb(Breadcrumb):
-    """Builds a breadcrumb for an `IDistribution`."""
-    @property
-    def text(self):
-        return self.context.displayname
-
-
 class DistributionFacets(QuestionTargetFacetMixin, StandardLaunchpadFacets):
 
     usedfor = IDistribution

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2009-09-02 13:28:19 +0000
+++ lib/lp/registry/browser/person.py	2009-09-03 15:04:13 +0000
@@ -22,7 +22,6 @@
     'PersonAnswersMenu',
     'PersonAssignedBugTaskSearchListingView',
     'PersonBrandingView',
-    'PersonBreadcrumb',
     'PersonBugsMenu',
     'PersonChangePasswordView',
     'PersonClaimView',
@@ -662,13 +661,6 @@
         return Link('+adminteammerge', text, icon='edit')
 
 
-class PersonBreadcrumb(Breadcrumb):
-    """Builds a breadcrumb for an `IPerson`."""
-    @property
-    def text(self):
-        return self.context.displayname
-
-
 class PersonFacets(StandardLaunchpadFacets):
     """The links that will appear in the facet menu for an IPerson."""
 

=== modified file 'lib/lp/registry/browser/product.py'
--- lib/lp/registry/browser/product.py	2009-08-31 23:45:03 +0000
+++ lib/lp/registry/browser/product.py	2009-09-03 15:04:13 +0000
@@ -11,7 +11,6 @@
     'ProductAddViewBase',
     'ProductAdminView',
     'ProductBrandingView',
-    'ProductBreadcrumb',
     'ProductBugsMenu',
     'ProductDownloadFileMixin',
     'ProductDownloadFilesView',
@@ -245,13 +244,6 @@
                 "you soon."))
 
 
-class ProductBreadcrumb(Breadcrumb):
-    """Builds a breadcrumb for an `IProduct`."""
-    @property
-    def text(self):
-        return self.context.displayname
-
-
 class ProductFacets(QuestionTargetFacetMixin, StandardLaunchpadFacets):
     """The links that will appear in the facet menu for an IProduct."""
 

=== modified file 'lib/lp/registry/browser/project.py'
--- lib/lp/registry/browser/project.py	2009-09-01 15:13:46 +0000
+++ lib/lp/registry/browser/project.py	2009-09-03 15:04:13 +0000
@@ -12,7 +12,6 @@
     'ProjectAddView',
     'ProjectAnswersMenu',
     'ProjectBrandingView',
-    'ProjectBreadcrumb',
     'ProjectBugsMenu',
     'ProjectEditView',
     'ProjectFacets',
@@ -104,13 +103,6 @@
         return self.redirectSubTree(canonical_url(project))
 
 
-class ProjectBreadcrumb(Breadcrumb):
-    """Builds a breadcrumb for an `IProject`."""
-    @property
-    def text(self):
-        return self.context.displayname
-
-
 class ProjectSetBreadcrumb(Breadcrumb):
     """Builds a breadcrumb for an `IProjectSet`."""
     text = 'Project Groups'

=== modified file 'lib/lp/registry/configure.zcml'
--- lib/lp/registry/configure.zcml	2009-08-28 06:16:06 +0000
+++ lib/lp/registry/configure.zcml	2009-09-03 15:04:13 +0000
@@ -313,7 +313,7 @@
     <adapter
         provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
         for="lp.registry.interfaces.project.IProject"
-        factory="lp.registry.browser.project.ProjectBreadcrumb"
+        factory="canonical.launchpad.webapp.breadcrumb.DisplaynameBreadcrumb"
         permission="zope.Public"/>
     <adapter
         provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
@@ -767,7 +767,7 @@
         <adapter
             provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
             for="lp.registry.interfaces.person.IPerson"
-            factory="lp.registry.browser.person.PersonBreadcrumb"
+            factory="canonical.launchpad.webapp.breadcrumb.DisplaynameBreadcrumb"
             permission="zope.Public"/>
         <adapter
             provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
@@ -1186,7 +1186,7 @@
     <adapter
         provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
         for="lp.registry.interfaces.product.IProduct"
-        factory="lp.registry.browser.product.ProductBreadcrumb"
+        factory="canonical.launchpad.webapp.breadcrumb.DisplaynameBreadcrumb"
         permission="zope.Public"/>
     <adapter
         provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
@@ -1432,7 +1432,7 @@
     <adapter
         provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
         for="lp.registry.interfaces.distribution.IDistribution"
-        factory="lp.registry.browser.distribution.DistributionBreadcrumb"
+        factory="canonical.launchpad.webapp.breadcrumb.DisplaynameBreadcrumb"
         permission="zope.Public"/>
     <adapter
         provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"

=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2009-09-01 18:26:21 +0000
+++ lib/lp/soyuz/browser/archive.py	2009-09-03 15:04:13 +0000
@@ -9,7 +9,6 @@
     'ArchiveAdminView',
     'ArchiveActivateView',
     'ArchiveBadges',
-    'ArchiveBreadcrumb',
     'ArchiveBuildsView',
     'ArchiveContextMenu',
     'ArchiveEditDependenciesView',
@@ -78,7 +77,6 @@
 from canonical.launchpad.webapp.authorization import check_permission
 from canonical.launchpad.webapp.badge import HasBadgeBase
 from canonical.launchpad.webapp.batching import BatchNavigator
-from canonical.launchpad.webapp.breadcrumb import Breadcrumb
 from canonical.launchpad.webapp.interfaces import ICanonicalUrlData
 from canonical.launchpad.webapp.menu import structured, NavigationMenu
 from canonical.widgets import (
@@ -382,14 +380,6 @@
     links = []
 
 
-class ArchiveBreadcrumb(Breadcrumb):
-    """Builds a breadcrumb for an `IArchive`."""
-
-    @property
-    def text(self):
-        return self.context.displayname
-
-
 class ArchiveViewBase(LaunchpadView):
     """Common features for Archive view classes."""
 

=== modified file 'lib/lp/soyuz/browser/builder.py'
--- lib/lp/soyuz/browser/builder.py	2009-08-27 19:22:38 +0000
+++ lib/lp/soyuz/browser/builder.py	2009-09-03 15:04:13 +0000
@@ -6,7 +6,6 @@
 __metaclass__ = type
 
 __all__ = [
-    'BuilderBreadcrumb',
     'BuilderFacets',
     'BuilderOverviewMenu',
     'BuilderNavigation',
@@ -74,13 +73,6 @@
     usedfor = IBuilder
 
 
-class BuilderBreadcrumb(Breadcrumb):
-    """Builds a breadcrumb for an `IBuilder`."""
-    @property
-    def text(self):
-        return self.context.title
-
-
 class BuilderSetFacets(StandardLaunchpadFacets):
     """The links that will appear in the facet menu for an IBuilderSet."""
     enable_only = ['overview']

=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml	2009-09-02 16:30:48 +0000
+++ lib/lp/soyuz/configure.zcml	2009-09-03 15:04:13 +0000
@@ -416,7 +416,7 @@
     <adapter
         provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
         for="lp.soyuz.interfaces.archive.IArchive"
-        factory="lp.soyuz.browser.archive.ArchiveBreadcrumb"
+        factory="canonical.launchpad.webapp.breadcrumb.DisplaynameBreadcrumb"
         permission="zope.Public"/>
 
     <!-- ArchiveSet -->
@@ -522,7 +522,7 @@
     <adapter
         provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
         for="lp.soyuz.interfaces.builder.IBuilder"
-        factory="lp.soyuz.browser.builder.BuilderBreadcrumb"
+        factory="canonical.launchpad.webapp.breadcrumb.TitleBreadcrumb"
         permission="zope.Public"/>
     <adapter
         provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"

=== modified file 'lib/lp/translations/browser/translationgroup.py'
--- lib/lp/translations/browser/translationgroup.py	2009-08-25 16:44:22 +0000
+++ lib/lp/translations/browser/translationgroup.py	2009-09-03 15:04:13 +0000
@@ -7,7 +7,6 @@
 __all__ = [
     'TranslationGroupAddTranslatorView',
     'TranslationGroupAddView',
-    'TranslationGroupBreadcrumb',
     'TranslationGroupEditView',
     'TranslationGroupNavigation',
     'TranslationGroupReassignmentView',
@@ -46,17 +45,9 @@
 
 class TranslationGroupSetBreadcrumb(Breadcrumb):
     """Builds a breadcrumb for an `ITranslationGroupSet`."""
-
     text = u"Translation groups"
 
 
-class TranslationGroupBreadcrumb(Breadcrumb):
-    """Builds a breadcrumb for an `ITranslationGroup`."""
-
-    @property
-    def text(self):
-        return self.context.title
-
 class TranslationGroupView:
 
     def __init__(self, context, request):

=== modified file 'lib/lp/translations/configure.zcml'
--- lib/lp/translations/configure.zcml	2009-08-25 16:44:22 +0000
+++ lib/lp/translations/configure.zcml	2009-09-03 15:04:13 +0000
@@ -397,7 +397,7 @@
         <adapter
             provides="canonical.launchpad.webapp.interfaces.IBreadcrumb"
             for="lp.translations.interfaces.translationgroup.ITranslationGroup"
-            factory="lp.translations.browser.translationgroup.TranslationGroupBreadcrumb"
+            factory="canonical.launchpad.webapp.breadcrumb.TitleBreadcrumb"
             permission="zope.Public"/>
 
         <!-- TranslationGroupSet -->