Launchpad itself

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

  1. advanced-search
  2. Merge into devel
Proposed by Jonathan Lange
Status: Merged
Approved by: Jonathan Lange
Approved revision: no longer in the source branch.
Merged at revision: 12577
Proposed branch: lp:~jml/launchpad/advanced-search
Merge into: lp:launchpad
Diff against target: 123 lines (+0/-45)
4 files modified
lib/lp/bugs/browser/bugtask.py (+0/-4)
lib/lp/bugs/templates/buglisting-default.pt (+0/-5)
lib/lp/bugs/templates/series-bug-nominations.pt (+0/-8)
lib/lp/registry/browser/person.py (+0/-28)
To merge this branch: bzr merge lp:~jml/launchpad/advanced-search
Reviewer Review Type Date Requested Status
Gavin Panella (community) Approve
Review via email: mp+51143@code.launchpad.net

Commit message

[r=allenap][bug=732713] Remove the duplicated header from advanced bug search page

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py 2011-03-07 02:50:50 +0000
+++ lib/lp/bugs/browser/bugtask.py 2011-03-10 16:20:35 +0000
@@ -2723,10 +2723,6 @@
2723 """Return data used to render the milestone checkboxes."""2723 """Return data used to render the milestone checkboxes."""
2724 return self.getWidgetValues("Milestone")2724 return self.getWidgetValues("Milestone")
27252725
2726 def getAdvancedSearchPageHeading(self):
2727 """The header for the advanced search page."""
2728 return "Bugs in %s: Advanced search" % self.context.displayname
2729
2730 def getSimpleSearchURL(self):2726 def getSimpleSearchURL(self):
2731 """Return a URL that can be used as an href to the simple search."""2727 """Return a URL that can be used as an href to the simple search."""
2732 return canonical_url(self.context) + "/+bugs"2728 return canonical_url(self.context) + "/+bugs"
27332729
=== 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-03-10 16:20:35 +0000
@@ -48,11 +48,6 @@
48 </tal:has_products>48 </tal:has_products>
49 </tal:is_project_group>49 </tal:is_project_group>
5050
51 <h1
52 tal:condition="view/shouldShowAdvancedForm"
53 tal:content="view/getAdvancedSearchPageHeading"
54 >Bugs in Fooix: Advanced search</h1>
55
56 <tal:do_not_show_advanced_form51 <tal:do_not_show_advanced_form
57 condition="not: view/shouldShowAdvancedForm">52 condition="not: view/shouldShowAdvancedForm">
58 <div tal:define="batch_navigator view/search">53 <div tal:define="batch_navigator view/search">
5954
=== 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-03-10 16:20:35 +0000
@@ -8,14 +8,6 @@
8<body>8<body>
9 <tal:main metal:fill-slot="main">9 <tal:main metal:fill-slot="main">
10 <div class="top-portlet">10 <div class="top-portlet">
11 <h1
12 tal:condition="view/shouldShowAdvancedForm"
13 tal:content="view/getAdvancedSearchPageHeading"
14 >Bugs nominated for Fooix: Advanced search</h1>
15 <h1 tal:condition="not: view/shouldShowAdvancedForm">
16 Bugs nominated for
17 <tal:software replace="context/displayname">Fooix</tal:software>
18 </h1>
1911
20 <tal:do_not_show_advanced_form12 <tal:do_not_show_advanced_form
21 condition="not: view/shouldShowAdvancedForm">13 condition="not: view/shouldShowAdvancedForm">
2214
=== modified file 'lib/lp/registry/browser/person.py'
--- lib/lp/registry/browser/person.py 2011-02-24 15:30:54 +0000
+++ lib/lp/registry/browser/person.py 2011-03-10 16:20:35 +0000
@@ -2120,10 +2120,6 @@
2120 return False2120 return False
21212121
2122 # Methods that customize the advanced search form.2122 # Methods that customize the advanced search form.
2123 def getAdvancedSearchPageHeading(self):
2124 return (
2125 "Bugs in %s: Advanced Search" % self.current_package.displayname)
2126
2127 def getAdvancedSearchButtonLabel(self):2123 def getAdvancedSearchButtonLabel(self):
2128 return "Search bugs in %s" % self.current_package.displayname2124 return "Search bugs in %s" % self.current_package.displayname
21292125
@@ -2197,10 +2193,6 @@
2197 def getSearchPageHeading(self):2193 def getSearchPageHeading(self):
2198 return "Bugs related to %s" % self.context.displayname2194 return "Bugs related to %s" % self.context.displayname
21992195
2200 def getAdvancedSearchPageHeading(self):
2201 return "Bugs Related to %s: Advanced Search" % (
2202 self.context.displayname)
2203
2204 def getAdvancedSearchButtonLabel(self):2196 def getAdvancedSearchButtonLabel(self):
2205 return "Search bugs related to %s" % self.context.displayname2197 return "Search bugs related to %s" % self.context.displayname
22062198
@@ -2252,11 +2244,6 @@
2252 """The header for the search page."""2244 """The header for the search page."""
2253 return "Bugs assigned to %s" % self.context.displayname2245 return "Bugs assigned to %s" % self.context.displayname
22542246
2255 def getAdvancedSearchPageHeading(self):
2256 """The header for the advanced search page."""
2257 return "Bugs Assigned to %s: Advanced Search" % (
2258 self.context.displayname)
2259
2260 def getAdvancedSearchButtonLabel(self):2247 def getAdvancedSearchButtonLabel(self):
2261 """The Search button for the advanced search page."""2248 """The Search button for the advanced search page."""
2262 return "Search bugs assigned to %s" % self.context.displayname2249 return "Search bugs assigned to %s" % self.context.displayname
@@ -2298,11 +2285,6 @@
2298 """The header for the search page."""2285 """The header for the search page."""
2299 return "Bugs commented on by %s" % self.context.displayname2286 return "Bugs commented on by %s" % self.context.displayname
23002287
2301 def getAdvancedSearchPageHeading(self):
2302 """The header for the advanced search page."""
2303 return "Bugs commented on by %s: Advanced Search" % (
2304 self.context.displayname)
2305
2306 def getAdvancedSearchButtonLabel(self):2288 def getAdvancedSearchButtonLabel(self):
2307 """The Search button for the advanced search page."""2289 """The Search button for the advanced search page."""
2308 return "Search bugs commented on by %s" % self.context.displayname2290 return "Search bugs commented on by %s" % self.context.displayname
@@ -2347,11 +2329,6 @@
2347 """The header for the search page."""2329 """The header for the search page."""
2348 return "Bugs reported by %s" % self.context.displayname2330 return "Bugs reported by %s" % self.context.displayname
23492331
2350 def getAdvancedSearchPageHeading(self):
2351 """The header for the advanced search page."""
2352 return "Bugs Reported by %s: Advanced Search" % (
2353 self.context.displayname)
2354
2355 def getAdvancedSearchButtonLabel(self):2332 def getAdvancedSearchButtonLabel(self):
2356 """The Search button for the advanced search page."""2333 """The Search button for the advanced search page."""
2357 return "Search bugs reported by %s" % self.context.displayname2334 return "Search bugs reported by %s" % self.context.displayname
@@ -2401,11 +2378,6 @@
2401 """The header for the search page."""2378 """The header for the search page."""
2402 return "Bugs %s is subscribed to" % self.context.displayname2379 return "Bugs %s is subscribed to" % self.context.displayname
24032380
2404 def getAdvancedSearchPageHeading(self):
2405 """The header for the advanced search page."""
2406 return "Bugs %s is Cc'd to: Advanced Search" % (
2407 self.context.displayname)
2408
2409 def getAdvancedSearchButtonLabel(self):2381 def getAdvancedSearchButtonLabel(self):
2410 """The Search button for the advanced search page."""2382 """The Search button for the advanced search page."""
2411 return "Search bugs %s is Cc'd to" % self.context.displayname2383 return "Search bugs %s is Cc'd to" % self.context.displayname