launchpad-reviewers team mailing list archive

Thread
Date

[Merge] lp:~jml/launchpad/advanced-search into lp:launchpad

To: mp+51143@xxxxxxxxxxxxxxxxxx
From: Jonathan Lange <jml@xxxxxxxxx>
Date: Thu, 10 Mar 2011 16:15:35 -0000
Reply-to: mp+51143@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Jonathan Lange has proposed merging lp:~jml/launchpad/advanced-search into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~jml/launchpad/advanced-search/+merge/51143

Removes the duplicated header from advanced search. I had thought there was a bug for this, but I can't find it.

It passes all of the tests, so I'm thinking it's OK to land.
-- 
https://code.launchpad.net/~jml/launchpad/advanced-search/+merge/51143
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~jml/launchpad/advanced-search into lp:launchpad.

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2011-02-22 08:42:07 +0000
+++ lib/lp/bugs/browser/bugtask.py	2011-02-24 15:06:18 +0000
@@ -2721,10 +2721,6 @@
         """Return data used to render the milestone checkboxes."""
         return self.getWidgetValues("Milestone")
 
-    def getAdvancedSearchPageHeading(self):
-        """The header for the advanced search page."""
-        return "Bugs in %s: Advanced search" % self.context.displayname
-
     def getSimpleSearchURL(self):
         """Return a URL that can be used as an href to the simple search."""
         return canonical_url(self.context) + "/+bugs"

=== modified file 'lib/lp/bugs/templates/buglisting-default.pt'
--- lib/lp/bugs/templates/buglisting-default.pt	2010-10-08 12:06:55 +0000
+++ lib/lp/bugs/templates/buglisting-default.pt	2011-02-24 15:06:18 +0000
@@ -48,11 +48,6 @@
         </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">

=== modified file 'lib/lp/bugs/templates/series-bug-nominations.pt'
--- lib/lp/bugs/templates/series-bug-nominations.pt	2009-09-09 15:46:28 +0000
+++ lib/lp/bugs/templates/series-bug-nominations.pt	2011-02-24 15:06:18 +0000
@@ -8,14 +8,6 @@
 <body>
   <tal:main metal:fill-slot="main">
     <div class="top-portlet">
-      <h1
-        tal:condition="view/shouldShowAdvancedForm"
-        tal:content="view/getAdvancedSearchPageHeading"
-      >Bugs nominated for Fooix: Advanced search</h1>
-      <h1 tal:condition="not: view/shouldShowAdvancedForm">
-        Bugs nominated for
-        <tal:software replace="context/displayname">Fooix</tal:software>
-      </h1>
 
       <tal:do_not_show_advanced_form
         condition="not: view/shouldShowAdvancedForm">

=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py	2011-02-11 23:33:42 +0000
+++ lib/lp/registry/browser/person.py	2011-02-24 15:06:18 +0000
@@ -2120,10 +2120,6 @@
         return False
 
     # Methods that customize the advanced search form.
-    def getAdvancedSearchPageHeading(self):
-        return (
-            "Bugs in %s: Advanced Search" % self.current_package.displayname)
-
     def getAdvancedSearchButtonLabel(self):
         return "Search bugs in %s" % self.current_package.displayname
 
@@ -2197,10 +2193,6 @@
     def getSearchPageHeading(self):
         return "Bugs related to %s" % self.context.displayname
 
-    def getAdvancedSearchPageHeading(self):
-        return "Bugs Related to %s: Advanced Search" % (
-            self.context.displayname)
-
     def getAdvancedSearchButtonLabel(self):
         return "Search bugs related to %s" % self.context.displayname
 
@@ -2252,11 +2244,6 @@
         """The header for the search page."""
         return "Bugs assigned to %s" % self.context.displayname
 
-    def getAdvancedSearchPageHeading(self):
-        """The header for the advanced search page."""
-        return "Bugs Assigned to %s: Advanced Search" % (
-            self.context.displayname)
-
     def getAdvancedSearchButtonLabel(self):
         """The Search button for the advanced search page."""
         return "Search bugs assigned to %s" % self.context.displayname
@@ -2298,11 +2285,6 @@
         """The header for the search page."""
         return "Bugs commented on by %s" % self.context.displayname
 
-    def getAdvancedSearchPageHeading(self):
-        """The header for the advanced search page."""
-        return "Bugs commented on by %s: Advanced Search" % (
-            self.context.displayname)
-
     def getAdvancedSearchButtonLabel(self):
         """The Search button for the advanced search page."""
         return "Search bugs commented on by %s" % self.context.displayname
@@ -2347,11 +2329,6 @@
         """The header for the search page."""
         return "Bugs reported by %s" % self.context.displayname
 
-    def getAdvancedSearchPageHeading(self):
-        """The header for the advanced search page."""
-        return "Bugs Reported by %s: Advanced Search" % (
-            self.context.displayname)
-
     def getAdvancedSearchButtonLabel(self):
         """The Search button for the advanced search page."""
         return "Search bugs reported by %s" % self.context.displayname
@@ -2401,11 +2378,6 @@
         """The header for the search page."""
         return "Bugs %s is subscribed to" % self.context.displayname
 
-    def getAdvancedSearchPageHeading(self):
-        """The header for the advanced search page."""
-        return "Bugs %s is Cc'd to: Advanced Search" % (
-            self.context.displayname)
-
     def getAdvancedSearchButtonLabel(self):
         """The Search button for the advanced search page."""
         return "Search bugs %s is Cc'd to" % self.context.displayname