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
1=== modified file 'lib/lp/bugs/browser/bugtask.py'
2--- lib/lp/bugs/browser/bugtask.py 2011-03-07 02:50:50 +0000
3+++ lib/lp/bugs/browser/bugtask.py 2011-03-10 16:20:35 +0000
4@@ -2723,10 +2723,6 @@
5 """Return data used to render the milestone checkboxes."""
6 return self.getWidgetValues("Milestone")
7
8- def getAdvancedSearchPageHeading(self):
9- """The header for the advanced search page."""
10- return "Bugs in %s: Advanced search" % self.context.displayname
11-
12 def getSimpleSearchURL(self):
13 """Return a URL that can be used as an href to the simple search."""
14 return canonical_url(self.context) + "/+bugs"
15
16=== modified file 'lib/lp/bugs/templates/buglisting-default.pt'
17--- lib/lp/bugs/templates/buglisting-default.pt 2010-10-08 12:06:55 +0000
18+++ lib/lp/bugs/templates/buglisting-default.pt 2011-03-10 16:20:35 +0000
19@@ -48,11 +48,6 @@
20 </tal:has_products>
21 </tal:is_project_group>
22
23- <h1
24- tal:condition="view/shouldShowAdvancedForm"
25- tal:content="view/getAdvancedSearchPageHeading"
26- >Bugs in Fooix: Advanced search</h1>
27-
28 <tal:do_not_show_advanced_form
29 condition="not: view/shouldShowAdvancedForm">
30 <div tal:define="batch_navigator view/search">
31
32=== modified file 'lib/lp/bugs/templates/series-bug-nominations.pt'
33--- lib/lp/bugs/templates/series-bug-nominations.pt 2009-09-09 15:46:28 +0000
34+++ lib/lp/bugs/templates/series-bug-nominations.pt 2011-03-10 16:20:35 +0000
35@@ -8,14 +8,6 @@
36 <body>
37 <tal:main metal:fill-slot="main">
38 <div class="top-portlet">
39- <h1
40- tal:condition="view/shouldShowAdvancedForm"
41- tal:content="view/getAdvancedSearchPageHeading"
42- >Bugs nominated for Fooix: Advanced search</h1>
43- <h1 tal:condition="not: view/shouldShowAdvancedForm">
44- Bugs nominated for
45- <tal:software replace="context/displayname">Fooix</tal:software>
46- </h1>
47
48 <tal:do_not_show_advanced_form
49 condition="not: view/shouldShowAdvancedForm">
50
51=== modified file 'lib/lp/registry/browser/person.py'
52--- lib/lp/registry/browser/person.py 2011-02-24 15:30:54 +0000
53+++ lib/lp/registry/browser/person.py 2011-03-10 16:20:35 +0000
54@@ -2120,10 +2120,6 @@
55 return False
56
57 # Methods that customize the advanced search form.
58- def getAdvancedSearchPageHeading(self):
59- return (
60- "Bugs in %s: Advanced Search" % self.current_package.displayname)
61-
62 def getAdvancedSearchButtonLabel(self):
63 return "Search bugs in %s" % self.current_package.displayname
64
65@@ -2197,10 +2193,6 @@
66 def getSearchPageHeading(self):
67 return "Bugs related to %s" % self.context.displayname
68
69- def getAdvancedSearchPageHeading(self):
70- return "Bugs Related to %s: Advanced Search" % (
71- self.context.displayname)
72-
73 def getAdvancedSearchButtonLabel(self):
74 return "Search bugs related to %s" % self.context.displayname
75
76@@ -2252,11 +2244,6 @@
77 """The header for the search page."""
78 return "Bugs assigned to %s" % self.context.displayname
79
80- def getAdvancedSearchPageHeading(self):
81- """The header for the advanced search page."""
82- return "Bugs Assigned to %s: Advanced Search" % (
83- self.context.displayname)
84-
85 def getAdvancedSearchButtonLabel(self):
86 """The Search button for the advanced search page."""
87 return "Search bugs assigned to %s" % self.context.displayname
88@@ -2298,11 +2285,6 @@
89 """The header for the search page."""
90 return "Bugs commented on by %s" % self.context.displayname
91
92- def getAdvancedSearchPageHeading(self):
93- """The header for the advanced search page."""
94- return "Bugs commented on by %s: Advanced Search" % (
95- self.context.displayname)
96-
97 def getAdvancedSearchButtonLabel(self):
98 """The Search button for the advanced search page."""
99 return "Search bugs commented on by %s" % self.context.displayname
100@@ -2347,11 +2329,6 @@
101 """The header for the search page."""
102 return "Bugs reported by %s" % self.context.displayname
103
104- def getAdvancedSearchPageHeading(self):
105- """The header for the advanced search page."""
106- return "Bugs Reported by %s: Advanced Search" % (
107- self.context.displayname)
108-
109 def getAdvancedSearchButtonLabel(self):
110 """The Search button for the advanced search page."""
111 return "Search bugs reported by %s" % self.context.displayname
112@@ -2401,11 +2378,6 @@
113 """The header for the search page."""
114 return "Bugs %s is subscribed to" % self.context.displayname
115
116- def getAdvancedSearchPageHeading(self):
117- """The header for the advanced search page."""
118- return "Bugs %s is Cc'd to: Advanced Search" % (
119- self.context.displayname)
120-
121 def getAdvancedSearchButtonLabel(self):
122 """The Search button for the advanced search page."""
123 return "Search bugs %s is Cc'd to" % self.context.displayname