Merge lp:~stevenk/launchpad/kill-+viewstatus into lp:launchpad
- kill-+viewstatus
- Merge into devel
Proposed by
Steve Kowalik
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Steve Kowalik | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 14090 | ||||
Proposed branch: | lp:~stevenk/launchpad/kill-+viewstatus | ||||
Merge into: | lp:launchpad | ||||
Diff against target: |
399 lines (+12/-255) 10 files modified
lib/canonical/launchpad/doc/textformatting.txt (+2/-2) lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt (+1/-1) lib/lp/bugs/browser/bugtask.py (+2/-40) lib/lp/bugs/browser/configure.zcml (+0/-6) lib/lp/bugs/stories/bugs/xx-bug-obfuscation.txt (+0/-29) lib/lp/bugs/stories/bugtask-management/xx-view-non-editable-bug-task.txt (+0/-16) lib/lp/bugs/stories/standalone/xx-view-package-bug-task-anonymous.txt (+0/-8) lib/lp/bugs/templates/bugtask-view.pt (+0/-141) lib/lp/registry/stories/milestone/xx-create-milestone-on-distribution.txt (+0/-9) lib/lp/registry/stories/person/xx-deactivate-account.txt (+7/-3) |
||||
To merge this branch: | bzr merge lp:~stevenk/launchpad/kill-+viewstatus | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gavin Panella (community) | code | Approve | |
Raphaël Badin (community) | code* | Approve | |
Review via email: mp+77460@code.launchpad.net |
Commit message
[r=allenap,rvb][bug=125173] Consign BugTask:+viewstatus to The Great Bitbucket in the Sky.
Description of the change
Consign BugTask:+viewstatus to The Great Bitbucket in the Sky.
To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) : | # |
review:
Approve
(code)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'lib/canonical/launchpad/doc/textformatting.txt' | |||
2 | --- lib/canonical/launchpad/doc/textformatting.txt 2011-03-11 00:04:26 +0000 | |||
3 | +++ lib/canonical/launchpad/doc/textformatting.txt 2011-10-03 03:02:25 +0000 | |||
4 | @@ -126,13 +126,13 @@ | |||
5 | 126 | 126 | ||
6 | 127 | >>> long_word = ( | 127 | >>> long_word = ( |
7 | 128 | ... "This paragraph includes a long URL, " | 128 | ... "This paragraph includes a long URL, " |
9 | 129 | ... "https://launchpad.net/greenishballoon/+bug/1733/+viewstatus. " | 129 | ... "https://launchpad.net/greenishballoon/+bug/1733/+subscriptions. " |
10 | 130 | ... "Even though it's longer than 56 characters, it stays on a " | 130 | ... "Even though it's longer than 56 characters, it stays on a " |
11 | 131 | ... "single line.") | 131 | ... "single line.") |
12 | 132 | >>> wrapped_text = mailwrapper.format(long_word) | 132 | >>> wrapped_text = mailwrapper.format(long_word) |
13 | 133 | >>> print wrapped_text #doctest: -NORMALIZE_WHITESPACE | 133 | >>> print wrapped_text #doctest: -NORMALIZE_WHITESPACE |
14 | 134 | This paragraph includes a long URL, | 134 | This paragraph includes a long URL, |
16 | 135 | https://launchpad.net/greenishballoon/+bug/1733/+viewstatus. | 135 | https://launchpad.net/greenishballoon/+bug/1733/+subscriptions. |
17 | 136 | Even though it's longer than 56 characters, it stays on | 136 | Even though it's longer than 56 characters, it stays on |
18 | 137 | a single line. | 137 | a single line. |
19 | 138 | 138 | ||
20 | 139 | 139 | ||
21 | === modified file 'lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt' | |||
22 | --- lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt 2011-09-01 05:09:54 +0000 | |||
23 | +++ lib/canonical/launchpad/pagetests/basics/notfound-traversals.txt 2011-10-03 03:02:25 +0000 | |||
24 | @@ -316,7 +316,7 @@ | |||
25 | 316 | bugtask is also assigned to a milestone (a corner case, but one that was causing | 316 | bugtask is also assigned to a milestone (a corner case, but one that was causing |
26 | 317 | OOPS's all the same!): | 317 | OOPS's all the same!): |
27 | 318 | 318 | ||
29 | 319 | >>> check("/debian/sarge/+source/mozilla-firefox/+bug/3/+viewstatus") | 319 | >>> check("/debian/sarge/+source/mozilla-firefox/+bug/3") |
30 | 320 | 320 | ||
31 | 321 | The bug filing pages. | 321 | The bug filing pages. |
32 | 322 | 322 | ||
33 | 323 | 323 | ||
34 | === modified file 'lib/lp/bugs/browser/bugtask.py' | |||
35 | --- lib/lp/bugs/browser/bugtask.py 2011-09-30 06:31:35 +0000 | |||
36 | +++ lib/lp/bugs/browser/bugtask.py 2011-10-03 03:02:25 +0000 | |||
37 | @@ -29,7 +29,6 @@ | |||
38 | 29 | 'BugTasksAndNominationsView', | 29 | 'BugTasksAndNominationsView', |
39 | 30 | 'BugTaskSearchListingView', | 30 | 'BugTaskSearchListingView', |
40 | 31 | 'BugTaskSetNavigation', | 31 | 'BugTaskSetNavigation', |
41 | 32 | 'BugTaskStatusView', | ||
42 | 33 | 'BugTaskTableRowView', | 32 | 'BugTaskTableRowView', |
43 | 34 | 'BugTaskTextView', | 33 | 'BugTaskTextView', |
44 | 35 | 'BugTaskView', | 34 | 'BugTaskView', |
45 | @@ -84,14 +83,10 @@ | |||
46 | 84 | from zope.app.form import CustomWidgetFactory | 83 | from zope.app.form import CustomWidgetFactory |
47 | 85 | from zope.app.form.browser.itemswidgets import RadioWidget | 84 | from zope.app.form.browser.itemswidgets import RadioWidget |
48 | 86 | from zope.app.form.interfaces import ( | 85 | from zope.app.form.interfaces import ( |
49 | 87 | IDisplayWidget, | ||
50 | 88 | IInputWidget, | 86 | IInputWidget, |
51 | 89 | InputErrors, | 87 | InputErrors, |
52 | 90 | ) | 88 | ) |
57 | 91 | from zope.app.form.utility import ( | 89 | from zope.app.form.utility import setUpWidget |
54 | 92 | setUpWidget, | ||
55 | 93 | setUpWidgets, | ||
56 | 94 | ) | ||
58 | 95 | from zope.component import ( | 90 | from zope.component import ( |
59 | 96 | ComponentLookupError, | 91 | ComponentLookupError, |
60 | 97 | getAdapter, | 92 | getAdapter, |
61 | @@ -1737,36 +1732,6 @@ | |||
62 | 1737 | self.updateContextFromData(data) | 1732 | self.updateContextFromData(data) |
63 | 1738 | 1733 | ||
64 | 1739 | 1734 | ||
65 | 1740 | class BugTaskStatusView(LaunchpadView): | ||
66 | 1741 | """Viewing the status of a bug task.""" | ||
67 | 1742 | |||
68 | 1743 | page_title = 'View status' | ||
69 | 1744 | |||
70 | 1745 | def initialize(self): | ||
71 | 1746 | """Set up the appropriate widgets. | ||
72 | 1747 | |||
73 | 1748 | Different widgets are shown depending on if it's a remote bug | ||
74 | 1749 | task or not. | ||
75 | 1750 | """ | ||
76 | 1751 | field_names = [ | ||
77 | 1752 | 'status', 'importance', 'assignee'] | ||
78 | 1753 | if not self.context.target_uses_malone: | ||
79 | 1754 | field_names += ['bugwatch'] | ||
80 | 1755 | self.milestone_widget = None | ||
81 | 1756 | else: | ||
82 | 1757 | field_names += ['milestone'] | ||
83 | 1758 | self.bugwatch_widget = None | ||
84 | 1759 | |||
85 | 1760 | if self.context.distroseries or self.context.distribution: | ||
86 | 1761 | field_names += ['sourcepackagename'] | ||
87 | 1762 | |||
88 | 1763 | self.assignee_widget = CustomWidgetFactory(AssigneeDisplayWidget) | ||
89 | 1764 | self.status_widget = CustomWidgetFactory(DBItemDisplayWidget) | ||
90 | 1765 | self.importance_widget = CustomWidgetFactory(DBItemDisplayWidget) | ||
91 | 1766 | |||
92 | 1767 | setUpWidgets(self, IBugTask, IDisplayWidget, names=field_names) | ||
93 | 1768 | |||
94 | 1769 | |||
95 | 1770 | class BugTaskListingView(LaunchpadView): | 1735 | class BugTaskListingView(LaunchpadView): |
96 | 1771 | """A view designed for displaying bug tasks in lists.""" | 1736 | """A view designed for displaying bug tasks in lists.""" |
97 | 1772 | # Note that this right now is only used in tests and to render | 1737 | # Note that this right now is only used in tests and to render |
98 | @@ -3559,10 +3524,8 @@ | |||
99 | 3559 | def initialize(self): | 3524 | def initialize(self): |
100 | 3560 | super(BugTaskTableRowView, self).initialize() | 3525 | super(BugTaskTableRowView, self).initialize() |
101 | 3561 | link = canonical_url(self.context) | 3526 | link = canonical_url(self.context) |
104 | 3562 | edit_link = link + '/+editstatus' | 3527 | task_link = edit_link = link + '/+editstatus' |
103 | 3563 | view_link = link + '/+viewstatus' | ||
105 | 3564 | can_edit = check_permission('launchpad.Edit', self.context) | 3528 | can_edit = check_permission('launchpad.Edit', self.context) |
106 | 3565 | task_link = edit_link if can_edit else view_link | ||
107 | 3566 | bugtask_id = self.context.id | 3529 | bugtask_id = self.context.id |
108 | 3567 | launchbag = getUtility(ILaunchBag) | 3530 | launchbag = getUtility(ILaunchBag) |
109 | 3568 | is_primary = self.context.id == launchbag.bugtask.id | 3531 | is_primary = self.context.id == launchbag.bugtask.id |
110 | @@ -3575,7 +3538,6 @@ | |||
111 | 3575 | is_conjoined_slave=self.is_conjoined_slave, | 3538 | is_conjoined_slave=self.is_conjoined_slave, |
112 | 3576 | task_link=task_link, | 3539 | task_link=task_link, |
113 | 3577 | edit_link=edit_link, | 3540 | edit_link=edit_link, |
114 | 3578 | view_link=view_link, | ||
115 | 3579 | can_edit=can_edit, | 3541 | can_edit=can_edit, |
116 | 3580 | link=link, | 3542 | link=link, |
117 | 3581 | id=bugtask_id, | 3543 | id=bugtask_id, |
118 | 3582 | 3544 | ||
119 | === modified file 'lib/lp/bugs/browser/configure.zcml' | |||
120 | --- lib/lp/bugs/browser/configure.zcml 2011-09-29 07:12:45 +0000 | |||
121 | +++ lib/lp/bugs/browser/configure.zcml 2011-10-03 03:02:25 +0000 | |||
122 | @@ -687,12 +687,6 @@ | |||
123 | 687 | permission="launchpad.Edit" | 687 | permission="launchpad.Edit" |
124 | 688 | template="../templates/bugtask-edit-form.pt" /> | 688 | template="../templates/bugtask-edit-form.pt" /> |
125 | 689 | <browser:page | 689 | <browser:page |
126 | 690 | name="+viewstatus" | ||
127 | 691 | for="lp.bugs.interfaces.bugtask.IBugTask" | ||
128 | 692 | class="lp.bugs.browser.bugtask.BugTaskStatusView" | ||
129 | 693 | permission="launchpad.View" | ||
130 | 694 | template="../templates/bugtask-view.pt"/> | ||
131 | 695 | <browser:page | ||
132 | 696 | name="+listing-view" | 690 | name="+listing-view" |
133 | 697 | for="lp.bugs.interfaces.bugtask.IBugTask" | 691 | for="lp.bugs.interfaces.bugtask.IBugTask" |
134 | 698 | class="lp.bugs.browser.bugtask.BugTaskListingView" | 692 | class="lp.bugs.browser.bugtask.BugTaskListingView" |
135 | 699 | 693 | ||
136 | === modified file 'lib/lp/bugs/stories/bugs/xx-bug-obfuscation.txt' | |||
137 | --- lib/lp/bugs/stories/bugs/xx-bug-obfuscation.txt 2010-07-15 08:38:19 +0000 | |||
138 | +++ lib/lp/bugs/stories/bugs/xx-bug-obfuscation.txt 2011-10-03 03:02:25 +0000 | |||
139 | @@ -18,18 +18,6 @@ | |||
140 | 18 | >>> description.renderContents() | 18 | >>> description.renderContents() |
141 | 19 | '...<p>Shirtpkdf user@domain.org lkjd hlkjfds...' | 19 | '...<p>Shirtpkdf user@domain.org lkjd hlkjfds...' |
142 | 20 | 20 | ||
143 | 21 | Using the +viewstatus page, he can also see the email address. | ||
144 | 22 | |||
145 | 23 | >>> user_browser.open( | ||
146 | 24 | ... 'http://bugs.launchpad.dev' | ||
147 | 25 | ... '/debian/sarge/+source/mozilla-firefox/+bug/3/+viewstatus') | ||
148 | 26 | >>> print user_browser.title | ||
149 | 27 | View status : Bug #3 : ... | ||
150 | 28 | |||
151 | 29 | >>> description = find_main_content(user_browser.contents).p | ||
152 | 30 | >>> description.renderContents() | ||
153 | 31 | 'Shirtpkdf user@domain.org lkjd hlkjfds...' | ||
154 | 32 | |||
155 | 33 | An anonymous cannot see the email address anywhere in the page. | 21 | An anonymous cannot see the email address anywhere in the page. |
156 | 34 | 22 | ||
157 | 35 | >>> anon_browser.open( | 23 | >>> anon_browser.open( |
158 | @@ -44,20 +32,3 @@ | |||
159 | 44 | >>> description = find_tag_by_id(anon_browser.contents, 'edit-description') | 32 | >>> description = find_tag_by_id(anon_browser.contents, 'edit-description') |
160 | 45 | >>> description.renderContents() | 33 | >>> description.renderContents() |
161 | 46 | '...<p>Shirtpkdf <email address hidden> lkjd hlkjfds...' | 34 | '...<p>Shirtpkdf <email address hidden> lkjd hlkjfds...' |
162 | 47 | |||
163 | 48 | Nor can the anonymous user see the email address in the +viewstatus | ||
164 | 49 | page. | ||
165 | 50 | |||
166 | 51 | >>> anon_browser.open( | ||
167 | 52 | ... 'http://bugs.launchpad.dev' | ||
168 | 53 | ... '/debian/sarge/+source/mozilla-firefox/+bug/3/+viewstatus') | ||
169 | 54 | >>> print anon_browser.title | ||
170 | 55 | View status : Bug #3 : ... | ||
171 | 56 | |||
172 | 57 | >>> 'user@domain.org' in anon_browser.contents | ||
173 | 58 | False | ||
174 | 59 | |||
175 | 60 | >>> description = find_main_content(anon_browser.contents).findAll('p')[1] | ||
176 | 61 | >>> description.renderContents() | ||
177 | 62 | 'Shirtpkdf <email address hidden> lkjd hlkjfds...' | ||
178 | 63 | |||
179 | 64 | 35 | ||
180 | === removed file 'lib/lp/bugs/stories/bugtask-management/xx-view-non-editable-bug-task.txt' | |||
181 | --- lib/lp/bugs/stories/bugtask-management/xx-view-non-editable-bug-task.txt 2009-09-18 15:24:30 +0000 | |||
182 | +++ lib/lp/bugs/stories/bugtask-management/xx-view-non-editable-bug-task.txt 1970-01-01 00:00:00 +0000 | |||
183 | @@ -1,16 +0,0 @@ | |||
184 | 1 | If someone views a bug task without logging in, they should see the task but | ||
185 | 2 | not be able to edit it. | ||
186 | 3 | |||
187 | 4 | >>> anon_browser.open('http://launchpad.dev/firefox/+bug/6/+viewstatus') | ||
188 | 5 | >>> print extract_text(find_main_content(anon_browser.contents)) | ||
189 | 6 | Mozilla Firefox Bug #6 | ||
190 | 7 | ... | ||
191 | 8 | To change this information, you must be logged in. | ||
192 | 9 | ... | ||
193 | 10 | |||
194 | 11 | >>> anon_browser.open('http://launchpad.dev/evolution/+bug/7/+viewstatus') | ||
195 | 12 | >>> print extract_text(find_main_content(anon_browser.contents)) | ||
196 | 13 | Evolution Bug #7 | ||
197 | 14 | ... | ||
198 | 15 | To change this information, you must be logged in. | ||
199 | 16 | ... | ||
200 | 17 | 0 | ||
201 | === removed file 'lib/lp/bugs/stories/standalone/xx-view-package-bug-task-anonymous.txt' | |||
202 | --- lib/lp/bugs/stories/standalone/xx-view-package-bug-task-anonymous.txt 2009-06-12 16:36:02 +0000 | |||
203 | +++ lib/lp/bugs/stories/standalone/xx-view-package-bug-task-anonymous.txt 1970-01-01 00:00:00 +0000 | |||
204 | @@ -1,8 +0,0 @@ | |||
205 | 1 | Anonymous users can view bug tasks on public bugs. | ||
206 | 2 | |||
207 | 3 | >>> print http(r""" | ||
208 | 4 | ... GET /debian/+source/mozilla-firefox/+bug/3/+viewstatus HTTP/1.1 | ||
209 | 5 | ... """) #doctest: -NORMALIZE_WHITESPACE | ||
210 | 6 | HTTP/1.1 200 Ok | ||
211 | 7 | ...Package... | ||
212 | 8 | ...mozilla-firefox... | ||
213 | 9 | 0 | ||
214 | === removed file 'lib/lp/bugs/templates/bugtask-view.pt' | |||
215 | --- lib/lp/bugs/templates/bugtask-view.pt 2011-09-08 22:50:59 +0000 | |||
216 | +++ lib/lp/bugs/templates/bugtask-view.pt 1970-01-01 00:00:00 +0000 | |||
217 | @@ -1,141 +0,0 @@ | |||
218 | 1 | <html | ||
219 | 2 | xmlns="http://www.w3.org/1999/xhtml" | ||
220 | 3 | xmlns:tal="http://xml.zope.org/namespaces/tal" | ||
221 | 4 | xmlns:metal="http://xml.zope.org/namespaces/metal" | ||
222 | 5 | xml:lang="en" | ||
223 | 6 | lang="en" | ||
224 | 7 | dir="ltr" | ||
225 | 8 | metal:use-macro="view/macro:page/main_only" | ||
226 | 9 | > | ||
227 | 10 | <body> | ||
228 | 11 | <div metal:fill-slot="main"> | ||
229 | 12 | <p tal:condition="context/bug/duplicateof" class="informational message"> | ||
230 | 13 | This bug is a duplicate of | ||
231 | 14 | <a href="#" | ||
232 | 15 | tal:attributes="href context/bug/duplicateof/fmt:url">bug | ||
233 | 16 | #<span tal:replace="context/bug/duplicateof/id">42</span></a> | ||
234 | 17 | </p> | ||
235 | 18 | |||
236 | 19 | <p tal:condition="not: context/required:launchpad.Edit" | ||
237 | 20 | class="informational message"> | ||
238 | 21 | <span tal:condition="not: request/lp:person"> | ||
239 | 22 | To <a href="+editstatus">change this information</a>, | ||
240 | 23 | you must be logged in. | ||
241 | 24 | </span> | ||
242 | 25 | </p> | ||
243 | 26 | |||
244 | 27 | <div metal:define-macro="editform"> | ||
245 | 28 | <div metal:define-macro="formbody"> | ||
246 | 29 | <p class="error message" | ||
247 | 30 | tal:define="status view/update|nothing" | ||
248 | 31 | tal:condition="status" | ||
249 | 32 | tal:content="status" /> | ||
250 | 33 | <p tal:define="errors view/errors|nothing" | ||
251 | 34 | tal:condition="errors" | ||
252 | 35 | class="error message"> | ||
253 | 36 | There are <strong | ||
254 | 37 | tal:content="view/errors/count:len" | ||
255 | 38 | >6</strong> | ||
256 | 39 | problems with the information you entered. | ||
257 | 40 | Please correct them and try again. | ||
258 | 41 | </p> | ||
259 | 42 | </div> | ||
260 | 43 | |||
261 | 44 | <h2>Status in | ||
262 | 45 | <tal:target replace="context/bugtargetname">Firefox</tal:target> | ||
263 | 46 | </h2> | ||
264 | 47 | |||
265 | 48 | <div class="field"> | ||
266 | 49 | <table> | ||
267 | 50 | <tr> | ||
268 | 51 | <td style="padding-right: 1em"> | ||
269 | 52 | <label tal:attributes="for view/status_widget/name" | ||
270 | 53 | tal:content="view/status_widget/label"> | ||
271 | 54 | Status | ||
272 | 55 | </label> | ||
273 | 56 | </td> | ||
274 | 57 | <td> | ||
275 | 58 | <label tal:attributes="for view/importance_widget/name" | ||
276 | 59 | tal:content="view/importance_widget/label"> | ||
277 | 60 | Importance | ||
278 | 61 | </label> | ||
279 | 62 | </td> | ||
280 | 63 | <td tal:condition="python:context.milestone and view.milestone_widget"> | ||
281 | 64 | <label tal:attributes="for view/milestone_widget/name" | ||
282 | 65 | tal:content="view/milestone_widget/label"> | ||
283 | 66 | Target | ||
284 | 67 | </label> | ||
285 | 68 | </td> | ||
286 | 69 | </tr> | ||
287 | 70 | <tr> | ||
288 | 71 | <td tal:content="structure view/status_widget" /> | ||
289 | 72 | <td tal:content="structure view/importance_widget" /> | ||
290 | 73 | <td tal:condition="python:context.milestone and view.milestone_widget" | ||
291 | 74 | tal:content="context/milestone/name" | ||
292 | 75 | id="milestone"> | ||
293 | 76 | </td> | ||
294 | 77 | </tr> | ||
295 | 78 | <tr tal:condition="python:context.distribution or | ||
296 | 79 | context.distroseries"> | ||
297 | 80 | <td colspan="0"> | ||
298 | 81 | <label tal:attributes="for view/sourcepackagename_widget/name" | ||
299 | 82 | tal:content="view/sourcepackagename_widget/label"> | ||
300 | 83 | Status | ||
301 | 84 | </label> | ||
302 | 85 | </td> | ||
303 | 86 | </tr> | ||
304 | 87 | <tr tal:condition="python:context.distribution or | ||
305 | 88 | context.distroseries"> | ||
306 | 89 | <td colspan="0" | ||
307 | 90 | tal:content="context/sourcepackagename/name|nothing" | ||
308 | 91 | style="white-space : nowrap;" /> | ||
309 | 92 | </tr> | ||
310 | 93 | <tr> | ||
311 | 94 | <td colspan="2"> | ||
312 | 95 | <label tal:attributes="for view/assignee_widget/name" | ||
313 | 96 | tal:content="view/assignee_widget/label"> | ||
314 | 97 | Assignee | ||
315 | 98 | </label> | ||
316 | 99 | </td> | ||
317 | 100 | <td colspan="2"> | ||
318 | 101 | <tal:block condition="view/bugwatch_widget"> | ||
319 | 102 | <label tal:attributes="for view/bugwatch_widget/name" | ||
320 | 103 | tal:content="view/bugwatch_widget/label" | ||
321 | 104 | style="white-space: nowrap"> | ||
322 | 105 | Remote Watch | ||
323 | 106 | </label> | ||
324 | 107 | </tal:block> | ||
325 | 108 | </td> | ||
326 | 109 | </tr> | ||
327 | 110 | <tr> | ||
328 | 111 | <td style="white-space : nowrap;" colspan="2"> | ||
329 | 112 | <span tal:replace="structure view/assignee_widget"> | ||
330 | 113 | Scott James Remnant | ||
331 | 114 | </span> | ||
332 | 115 | </td> | ||
333 | 116 | <td style="white-space : nowrap;" colspan="2" | ||
334 | 117 | tal:content="structure view/bugwatch_widget" /> | ||
335 | 118 | </tr> | ||
336 | 119 | </table> | ||
337 | 120 | </div> | ||
338 | 121 | |||
339 | 122 | <tal:user condition="view/user"> | ||
340 | 123 | <tal:description | ||
341 | 124 | define="global description context/bug/description/fmt:text-to-html" /> | ||
342 | 125 | </tal:user> | ||
343 | 126 | <tal:not-user condition="not:view/user"> | ||
344 | 127 | <tal:description | ||
345 | 128 | define="global description context/bug/description/fmt:obfuscate-email/fmt:text-to-html" /> | ||
346 | 129 | </tal:not-user> | ||
347 | 130 | |||
348 | 131 | <h2>Bug description</h2> | ||
349 | 132 | <tal:description | ||
350 | 133 | content="structure description" | ||
351 | 134 | > | ||
352 | 135 | $Bug.description | ||
353 | 136 | </tal:description> | ||
354 | 137 | |||
355 | 138 | </div> | ||
356 | 139 | </div> | ||
357 | 140 | </body> | ||
358 | 141 | </html> | ||
359 | 142 | 0 | ||
360 | === modified file 'lib/lp/registry/stories/milestone/xx-create-milestone-on-distribution.txt' | |||
361 | --- lib/lp/registry/stories/milestone/xx-create-milestone-on-distribution.txt 2009-09-14 15:03:45 +0000 | |||
362 | +++ lib/lp/registry/stories/milestone/xx-create-milestone-on-distribution.txt 2011-10-03 03:02:25 +0000 | |||
363 | @@ -49,12 +49,3 @@ | |||
364 | 49 | ... name='ubuntu_mozilla-firefox.milestone') | 49 | ... name='ubuntu_mozilla-firefox.milestone') |
365 | 50 | >>> milestone_control.value = [str(milestone.id)] | 50 | >>> milestone_control.value = [str(milestone.id)] |
366 | 51 | >>> name12_browser.getControl('Save Changes').click() | 51 | >>> name12_browser.getControl('Save Changes').click() |
367 | 52 | |||
368 | 53 | Verify that the bug now has the milestone set on the view page: | ||
369 | 54 | |||
370 | 55 | >>> anon_browser.open( | ||
371 | 56 | ... 'http://launchpad.dev/ubuntu/+source/mozilla-firefox/+bug/1/' | ||
372 | 57 | ... '+viewstatus') | ||
373 | 58 | >>> milestone_tag = find_tag_by_id(anon_browser.contents, 'milestone') | ||
374 | 59 | >>> print str(extract_text(milestone_tag)) | ||
375 | 60 | sounder01 | ||
376 | 61 | 52 | ||
377 | === modified file 'lib/lp/registry/stories/person/xx-deactivate-account.txt' | |||
378 | --- lib/lp/registry/stories/person/xx-deactivate-account.txt 2010-03-16 12:45:53 +0000 | |||
379 | +++ lib/lp/registry/stories/person/xx-deactivate-account.txt 2011-10-03 03:02:25 +0000 | |||
380 | @@ -54,12 +54,16 @@ | |||
381 | 54 | assignee. | 54 | assignee. |
382 | 55 | 55 | ||
383 | 56 | >>> browser.open('http://launchpad.dev/debian/+source/' | 56 | >>> browser.open('http://launchpad.dev/debian/+source/' |
385 | 57 | ... 'mozilla-firefox/+bug/3/+viewstatus') | 57 | ... 'mozilla-firefox/+bug/3') |
386 | 58 | >>> print extract_text(find_main_content(browser.contents)) | 58 | >>> print extract_text(find_main_content(browser.contents)) |
387 | 59 | Bug Title Test | ||
388 | 59 | Debian | 60 | Debian |
390 | 60 | ... | 61 | “mozilla-firefox” package |
391 | 61 | Bug #3 | 62 | Bug #3 |
393 | 62 | ...Assigned to unknown... | 63 | ... |
394 | 64 | Assigned to | ||
395 | 65 | Milestone | ||
396 | 66 | ... | ||
397 | 63 | 67 | ||
398 | 64 | Although teams have NOACCOUNT as their account_status, they are teams and so | 68 | Although teams have NOACCOUNT as their account_status, they are teams and so |
399 | 65 | it makes no sense to say they don't use Launchpad. | 69 | it makes no sense to say they don't use Launchpad. |
This branch looks good to land (+5/-247: that's just great ;)).