Launchpad itself

Merge lp:~kfogel/launchpad/531337-non-contradictory-search-options into lp:launchpad

  1. 531337-non-contradictory-search-options
  2. Merge into devel
Proposed by Karl Fogel
Status: Merged
Approved by: Karl Fogel
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp:~kfogel/launchpad/531337-non-contradictory-search-options
Merge into: lp:launchpad
Diff against target: 99 lines (+12/-12)
3 files modified
lib/lp/bugs/interfaces/bugtask.py (+2/-2)
lib/lp/bugs/stories/bugtask-searches/xx-filter-by-linked-branches.txt (+8/-8)
lib/lp/bugs/templates/bugtask-macros-tableview.pt (+2/-2)
To merge this branch: bzr merge lp:~kfogel/launchpad/531337-non-contradictory-search-options
Reviewer Review Type Date Requested Status
Deryck Hodge (community) code Approve
Review via email: mp+20697@code.launchpad.net

Description of the change

Fix bug #531337 (contradictory linked branch options in advanced search)
by removing the word "only", thus removing the contradiction. 'Nuff said.

To post a comment you must log in.
Revision history for this message
Deryck Hodge (deryck) wrote :

Looks good to me. Tom correctly noted on IRC that we would be better to fix the form more substantially, but this is fine for an immediate fix to correct the confusing language.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/bugs/interfaces/bugtask.py'
2--- lib/lp/bugs/interfaces/bugtask.py 2010-03-08 16:07:40 +0000
3+++ lib/lp/bugs/interfaces/bugtask.py 2010-03-09 18:39:31 +0000
4@@ -826,10 +826,10 @@
5 affects_me = Bool(
6 title=_('Show only bugs affecting me'), required=False)
7 has_branches = Bool(
8- title=_('Show only bugs with linked branches'), required=False,
9+ title=_('Show bugs with linked branches'), required=False,
10 default=True)
11 has_no_branches = Bool(
12- title=_('Show only bugs without linked branches'), required=False,
13+ title=_('Show bugs without linked branches'), required=False,
14 default=True)
15
16
17
18=== modified file 'lib/lp/bugs/stories/bugtask-searches/xx-filter-by-linked-branches.txt'
19--- lib/lp/bugs/stories/bugtask-searches/xx-filter-by-linked-branches.txt 2010-02-22 20:35:25 +0000
20+++ lib/lp/bugs/stories/bugtask-searches/xx-filter-by-linked-branches.txt 2010-03-09 18:39:31 +0000
21@@ -7,10 +7,10 @@
22 >>> anon_browser.open(
23 ... 'http://bugs.launchpad.dev/firefox/+bugs?advanced=1')
24 >>> anon_browser.getControl(
25- ... 'Show only bugs with linked branches').selected
26+ ... 'Show bugs with linked branches').selected
27 True
28 >>> anon_browser.getControl(
29- ... 'Show only bugs without linked branches').selected
30+ ... 'Show bugs without linked branches').selected
31 True
32
33 In this case all bugs are returned.
34@@ -22,13 +22,13 @@
35 4 Reflow problems with complex page layouts Medium New
36 1 Firefox does not support SVG Low New
37
38-When we uncheck 'Show only bugs without linked branches', only bugs with
39+When we uncheck 'Show bugs without linked branches', only bugs with
40 linkes branches are returned.
41
42 >>> anon_browser.open(
43 ... 'http://bugs.launchpad.dev/firefox/+bugs?advanced=1')
44 >>> without_branches = anon_browser.getControl(
45- ... 'Show only bugs without linked branches')
46+ ... 'Show bugs without linked branches')
47 >>> without_branches.selected = False
48 >>> anon_browser.getControl('Search', index=1).click()
49 >>> print_bugtasks(anon_browser.contents)
50@@ -36,12 +36,12 @@
51 4 Reflow problems with complex page layouts Medium New
52
53 Similary, we can search for branches that don't have linked branches, if
54-we uncheck 'Show only bugs with linked branches'.
55+we uncheck 'Show bugs with linked branches'.
56
57 >>> anon_browser.open(
58 ... 'http://bugs.launchpad.dev/firefox/+bugs?advanced=1')
59 >>> with_branches = anon_browser.getControl(
60- ... 'Show only bugs with linked branches')
61+ ... 'Show bugs with linked branches')
62 >>> with_branches.selected = False
63 >>> anon_browser.getControl('Search', index=1).click()
64 >>> print_bugtasks(anon_browser.contents)
65@@ -52,10 +52,10 @@
66 >>> anon_browser.open(
67 ... 'http://bugs.launchpad.dev/firefox/+bugs?advanced=1')
68 >>> with_branches = anon_browser.getControl(
69- ... 'Show only bugs with linked branches')
70+ ... 'Show bugs with linked branches')
71 >>> with_branches.selected = False
72 >>> without_branches = anon_browser.getControl(
73- ... 'Show only bugs without linked branches')
74+ ... 'Show bugs without linked branches')
75 >>> without_branches.selected = False
76 >>> anon_browser.getControl('Search', index=1).click()
77 >>> print_bugtasks(anon_browser.contents)
78
79=== modified file 'lib/lp/bugs/templates/bugtask-macros-tableview.pt'
80--- lib/lp/bugs/templates/bugtask-macros-tableview.pt 2010-02-22 20:35:25 +0000
81+++ lib/lp/bugs/templates/bugtask-macros-tableview.pt 2010-03-09 18:39:31 +0000
82@@ -618,7 +618,7 @@
83 <td style="white-space: nowrap">
84 <span tal:content="structure view/widgets/has_branches" />
85 <label style="font-weight: normal" for="field.has_branches">
86- Show only bugs with linked branches
87+ Show bugs with linked branches
88 </label>
89 </td>
90 <td>
91@@ -628,7 +628,7 @@
92 <td style="white-space: nowrap">
93 <span tal:content="structure view/widgets/has_no_branches" />
94 <label style="font-weight: normal" for="field.has_no_branches">
95- Show only bugs without linked branches
96+ Show bugs without linked branches
97 </label>
98 </td>
99 <td>