Merge lp:~wgrant/launchpad/no-title-actually into lp:launchpad
- no-title-actually
- Merge into devel
Proposed by
William Grant
Status: | Merged | ||||||||
---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 17609 | ||||||||
Proposed branch: | lp:~wgrant/launchpad/no-title-actually | ||||||||
Merge into: | lp:launchpad | ||||||||
Diff against target: |
1412 lines (+146/-164) 59 files modified
lib/lp/answers/stories/answer-contact-report.txt (+7/-7) lib/lp/app/browser/tests/watermark.txt (+3/-3) lib/lp/app/doc/lazr-js-widgets.txt (+4/-4) lib/lp/app/stories/launchpad-root/site-search.txt (+1/-1) lib/lp/archiveuploader/tests/nascentupload-announcements.txt (+2/-2) lib/lp/blueprints/stories/standalone/xx-batching.txt (+0/-1) lib/lp/bugs/browser/tests/test_bugalsoaffects.py (+1/-1) lib/lp/bugs/doc/bug.txt (+1/-1) lib/lp/bugs/doc/bugnotification-sending.txt (+1/-1) lib/lp/bugs/stories/bug-privacy/xx-bug-privacy.txt (+2/-2) lib/lp/bugs/stories/bug-release-management/nomination-navigation.txt (+1/-1) lib/lp/bugs/stories/bugs/xx-bug-activity.txt (+1/-1) lib/lp/bugs/stories/bugs/xx-bug-index.txt (+1/-1) lib/lp/bugs/stories/bugtask-management/xx-change-assignee.txt (+2/-4) lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt (+1/-2) lib/lp/bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt (+7/-7) lib/lp/code/stories/branches/xx-branch-index.txt (+1/-1) lib/lp/code/stories/branches/xx-product-branches.txt (+4/-6) lib/lp/registry/browser/distribution.py (+1/-3) lib/lp/registry/browser/product.py (+4/-4) lib/lp/registry/browser/project.py (+3/-4) lib/lp/registry/browser/tests/distribution-views.txt (+3/-4) lib/lp/registry/browser/tests/distributionmirror-views.txt (+2/-2) lib/lp/registry/browser/tests/test_product.py (+2/-4) lib/lp/registry/configure.zcml (+0/-2) lib/lp/registry/doc/person-karma.txt (+3/-3) lib/lp/registry/doc/pillar.txt (+8/-8) lib/lp/registry/doc/product.txt (+1/-1) lib/lp/registry/doc/projectgroup.txt (+2/-2) lib/lp/registry/doc/vocabularies.txt (+18/-16) lib/lp/registry/interfaces/product.py (+2/-1) lib/lp/registry/model/distribution.py (+6/-2) lib/lp/registry/model/product.py (+7/-3) lib/lp/registry/model/projectgroup.py (+6/-2) lib/lp/registry/stories/milestone/object-milestones.txt (+1/-1) lib/lp/registry/stories/object/xx-karmacontext-topcontributors.txt (+1/-1) lib/lp/registry/stories/object/xx-nameblacklist.txt (+0/-1) lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt (+0/-4) lib/lp/registry/stories/person/xx-person-projects.txt (+6/-6) lib/lp/registry/stories/product/xx-product-add.txt (+3/-10) lib/lp/registry/stories/product/xx-product-edit.txt (+0/-2) lib/lp/registry/stories/project/xx-project-add-product.txt (+0/-1) lib/lp/registry/stories/project/xx-project-add.txt (+0/-2) lib/lp/registry/stories/project/xx-project-edit.txt (+0/-1) lib/lp/registry/stories/project/xx-project-index.txt (+0/-1) lib/lp/registry/stories/webservice/xx-distribution.txt (+1/-1) lib/lp/registry/stories/webservice/xx-project-registry.txt (+2/-0) lib/lp/registry/tests/test_product.py (+1/-1) lib/lp/soyuz/doc/soyuz-set-of-uploads.txt (+1/-1) lib/lp/soyuz/stories/distribution/xx-distribution-packages.txt (+3/-3) lib/lp/soyuz/stories/packaging/package-pages-navigation.txt (+8/-8) lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt (+3/-3) lib/lp/soyuz/stories/soyuz/xx-distribution-add.txt (+1/-2) lib/lp/soyuz/stories/soyuz/xx-distribution-archives.txt (+2/-2) lib/lp/soyuz/stories/soyuz/xx-distribution-edit.txt (+0/-1) lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt (+1/-1) lib/lp/soyuz/stories/soyuz/xx-distro-distros-index.txt (+2/-2) lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt (+1/-1) lib/lp/translations/stories/standalone/xx-products-with-translations.txt (+1/-1) |
||||||||
To merge this branch: | bzr merge lp:~wgrant/launchpad/no-title-actually | ||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Colin Watson (community) | Approve | ||
Review via email: mp+263179@code.launchpad.net |
Commit message
Replace Product/
Description of the change
Replace Product/
Even I don't quite know where title is used instead of displayname, and separating them has limited benefits beyond confusion. The title attribute itself is now a property forwarding to displayname and the form fields are gone, though the code still sets the DB column while it remains NOT NULL.
To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'lib/lp/answers/stories/answer-contact-report.txt' |
2 | --- lib/lp/answers/stories/answer-contact-report.txt 2011-04-23 03:47:33 +0000 |
3 | +++ lib/lp/answers/stories/answer-contact-report.txt 2015-06-27 04:40:18 +0000 |
4 | @@ -28,18 +28,18 @@ |
5 | >>> content = find_tag_by_id( |
6 | ... anon_browser.contents, "direct-answer-contacts-for-list") |
7 | >>> print extract_text(content).encode('ascii', 'backslashreplace') |
8 | - Gnome Baker |
9 | + gnomebaker |
10 | ...mozilla-firefox... package in Ubuntu |
11 | |
12 | >>> content = find_tag_by_id( |
13 | ... anon_browser.contents, "team-answer-contacts-for-list") |
14 | >>> print extract_text(content) |
15 | - Gnome Baker |
16 | - The Gnome Panel Applets |
17 | + Gnome Applets |
18 | + gnomebaker |
19 | |
20 | Clicking on the name of the project will show the project answers. |
21 | |
22 | - >>> anon_browser.getLink('Gnome Baker').click() |
23 | + >>> anon_browser.getLink('gnomebaker').click() |
24 | >>> print anon_browser.title |
25 | Questions : gnomebaker |
26 | |
27 | @@ -56,8 +56,8 @@ |
28 | >>> content = find_tag_by_id( |
29 | ... browser.contents, "team-answer-contacts-for-list") |
30 | >>> print extract_text(content) |
31 | - Gnome Baker Unsubscribe team |
32 | - The Gnome Panel Applets Unsubscribe team |
33 | + Gnome Applets Unsubscribe team |
34 | + gnomebaker Unsubscribe team |
35 | |
36 | >>> browser.getLink(id="gnomebaker-setteamanswercontact").click() |
37 | >>> print browser.title |
38 | @@ -75,5 +75,5 @@ |
39 | >>> content = find_tag_by_id( |
40 | ... browser.contents, "direct-answer-contacts-for-list") |
41 | >>> print extract_text(content).encode('ascii', 'backslashreplace') |
42 | - Gnome Baker |
43 | + gnomebaker |
44 | ...mozilla-firefox... package in Ubuntu |
45 | |
46 | === modified file 'lib/lp/app/browser/tests/watermark.txt' |
47 | --- lib/lp/app/browser/tests/watermark.txt 2014-11-27 11:01:16 +0000 |
48 | +++ lib/lp/app/browser/tests/watermark.txt 2015-06-27 04:40:18 +0000 |
49 | @@ -28,7 +28,7 @@ |
50 | |
51 | Products directly implement IRootContext. |
52 | |
53 | - >>> widget = factory.makeProduct(title='Widget') |
54 | + >>> widget = factory.makeProduct(displayname='Widget') |
55 | >>> print get_hierarchy(widget).heading() |
56 | <h...><a...>Widget</a></h...> |
57 | |
58 | @@ -40,13 +40,13 @@ |
59 | |
60 | ProjectGroups also directly implement IRootContext ... |
61 | |
62 | - >>> kde = factory.makeProject(title='KDE') |
63 | + >>> kde = factory.makeProject(displayname='KDE') |
64 | >>> print get_hierarchy(kde).heading() |
65 | <h...><a...>KDE</a></h...> |
66 | |
67 | ... as do distributions ... |
68 | |
69 | - >>> mint = factory.makeDistribution(title='Mint Linux') |
70 | + >>> mint = factory.makeDistribution(displayname='Mint Linux') |
71 | >>> print get_hierarchy(mint).heading() |
72 | <h...><a...>Mint Linux</a></h...> |
73 | |
74 | |
75 | === modified file 'lib/lp/app/doc/lazr-js-widgets.txt' |
76 | --- lib/lp/app/doc/lazr-js-widgets.txt 2014-07-24 09:37:03 +0000 |
77 | +++ lib/lp/app/doc/lazr-js-widgets.txt 2015-06-27 04:40:18 +0000 |
78 | @@ -25,8 +25,8 @@ |
79 | |
80 | >>> from lp.registry.interfaces.product import IProduct |
81 | >>> product = factory.makeProduct( |
82 | - ... name='widget', title='Widgets > important') |
83 | - >>> title_field = IProduct['title'] |
84 | + ... name='widget', displayname='Widgets > important') |
85 | + >>> title_field = IProduct['displayname'] |
86 | >>> title = 'Edit the title' |
87 | >>> widget = TextLineEditorWidget( |
88 | ... product, title_field, title, 'h1', max_width='90%', |
89 | @@ -36,7 +36,7 @@ |
90 | content. |
91 | |
92 | >>> print widget() |
93 | - <h1 id="edit-title"> |
94 | + <h1 id="edit-displayname"> |
95 | <span style="max-width: 90%;" |
96 | class="yui3-editable_text-text ellipsis"> |
97 | Widgets > important |
98 | @@ -49,7 +49,7 @@ |
99 | |
100 | >>> ignored = login_person(product.owner) |
101 | >>> print widget() |
102 | - <h1 id="edit-title"> |
103 | + <h1 id="edit-displayname"> |
104 | <span style="max-width: 90%;" |
105 | class="yui3-editable_text-text ellipsis"> |
106 | Widgets > important |
107 | |
108 | === modified file 'lib/lp/app/stories/launchpad-root/site-search.txt' |
109 | --- lib/lp/app/stories/launchpad-root/site-search.txt 2013-09-27 04:13:23 +0000 |
110 | +++ lib/lp/app/stories/launchpad-root/site-search.txt 2015-06-27 04:40:18 +0000 |
111 | @@ -96,7 +96,7 @@ |
112 | >>> print_search_results() |
113 | 1 → 20 of 25 pages matching "bug"... |
114 | Launchpad Bugs... |
115 | - Bugs in Ubuntu Linux... |
116 | + Bugs in Ubuntu... |
117 | Bugs related to Sample Person... |
118 | Bug #1 in Mozilla Firefox: ...Firefox does not support SVG... |
119 | ... |
120 | |
121 | === modified file 'lib/lp/archiveuploader/tests/nascentupload-announcements.txt' |
122 | --- lib/lp/archiveuploader/tests/nascentupload-announcements.txt 2014-11-08 23:53:17 +0000 |
123 | +++ lib/lp/archiveuploader/tests/nascentupload-announcements.txt 2015-06-27 04:40:18 +0000 |
124 | @@ -525,7 +525,7 @@ |
125 | DEBUG |
126 | DEBUG Announcing to hoary-announce@lists.ubuntu.com |
127 | DEBUG |
128 | - DEBUG Thank you for your contribution to Ubuntu Linux. |
129 | + DEBUG Thank you for your contribution to Ubuntu. |
130 | DEBUG |
131 | DEBUG -- |
132 | DEBUG You are receiving this email because you are the uploader, |
133 | @@ -745,7 +745,7 @@ |
134 | <BLANKLINE> |
135 | Announcing to hoary-announce@lists.ubuntu.com |
136 | <BLANKLINE> |
137 | - Thank you for your contribution to Ubuntu Linux. |
138 | + Thank you for your contribution to Ubuntu. |
139 | <BLANKLINE> |
140 | -- = |
141 | <BLANKLINE> |
142 | |
143 | === modified file 'lib/lp/blueprints/stories/standalone/xx-batching.txt' |
144 | --- lib/lp/blueprints/stories/standalone/xx-batching.txt 2015-06-15 08:35:10 +0000 |
145 | +++ lib/lp/blueprints/stories/standalone/xx-batching.txt 2015-06-27 04:40:18 +0000 |
146 | @@ -14,7 +14,6 @@ |
147 | >>> browser.open("http://launchpad.dev/projects/+new") |
148 | >>> browser.getControl('URL', index=0).value = 'big-project' |
149 | >>> browser.getControl('Name').value = 'Big Project' |
150 | - >>> browser.getControl('Title').value = 'The Big Project' |
151 | >>> browser.getControl('Summary').value = 'A big project indeed.' |
152 | >>> browser.getControl('Continue').click() |
153 | |
154 | |
155 | === modified file 'lib/lp/bugs/browser/tests/test_bugalsoaffects.py' |
156 | --- lib/lp/bugs/browser/tests/test_bugalsoaffects.py 2012-10-04 23:15:35 +0000 |
157 | +++ lib/lp/bugs/browser/tests/test_bugalsoaffects.py 2015-06-27 04:40:18 +0000 |
158 | @@ -18,7 +18,7 @@ |
159 | |
160 | def setUp(self): |
161 | super(TestBugAlsoAffectsDistribution, self).setUp() |
162 | - self.distribution = self.factory.makeDistribution() |
163 | + self.distribution = self.factory.makeDistribution(displayname='Distro') |
164 | removeSecurityProxy(self.distribution).official_malone = True |
165 | |
166 | def openBugPage(self, bug): |
167 | |
168 | === modified file 'lib/lp/bugs/doc/bug.txt' |
169 | --- lib/lp/bugs/doc/bug.txt 2013-06-20 05:50:00 +0000 |
170 | +++ lib/lp/bugs/doc/bug.txt 2015-06-27 04:40:18 +0000 |
171 | @@ -604,7 +604,7 @@ |
172 | >>> notify(ObjectCreatedEvent(ubuntu_task)) |
173 | |
174 | >>> print ubuntu_task.distribution.title |
175 | - Ubuntu Linux |
176 | + Ubuntu |
177 | |
178 | And for a specific distribution series. |
179 | |
180 | |
181 | === modified file 'lib/lp/bugs/doc/bugnotification-sending.txt' |
182 | --- lib/lp/bugs/doc/bugnotification-sending.txt 2014-04-29 00:44:32 +0000 |
183 | +++ lib/lp/bugs/doc/bugnotification-sending.txt 2015-06-27 04:40:18 +0000 |
184 | @@ -807,7 +807,7 @@ |
185 | |
186 | >>> with lp_dbuser(): |
187 | ... bug = factory.makeBug( |
188 | - ... target=factory.makeProduct(title='Foo'), |
189 | + ... target=factory.makeProduct(displayname='Foo'), |
190 | ... title='In the beginning, the universe was created. This ' |
191 | ... 'has made a lot of people very angry and has been ' |
192 | ... 'widely regarded as a bad move', |
193 | |
194 | === modified file 'lib/lp/bugs/stories/bug-privacy/xx-bug-privacy.txt' |
195 | --- lib/lp/bugs/stories/bug-privacy/xx-bug-privacy.txt 2012-08-23 04:20:48 +0000 |
196 | +++ lib/lp/bugs/stories/bug-privacy/xx-bug-privacy.txt 2015-06-27 04:40:18 +0000 |
197 | @@ -21,7 +21,7 @@ |
198 | >>> browser.getControl("Private", index=1).selected |
199 | True |
200 | |
201 | -Foo Bar files a security (private) bug on Ubuntu Linux. He gets |
202 | +Foo Bar files a security (private) bug on Ubuntu. He gets |
203 | redirected to the bug page. |
204 | |
205 | >>> browser = setupBrowser("Basic foo.bar@canonical.com:test") |
206 | @@ -53,7 +53,7 @@ |
207 | >>> print browser.contents.replace(bug_id, "BUG-ID") |
208 | <!DOCTYPE... |
209 | ... |
210 | - ...Ubuntu Linux... |
211 | + ...Ubuntu... |
212 | ...<a...>...BUG-ID...</a>... |
213 | |
214 | Foo Bar is subscribed to the bug. |
215 | |
216 | === modified file 'lib/lp/bugs/stories/bug-release-management/nomination-navigation.txt' |
217 | --- lib/lp/bugs/stories/bug-release-management/nomination-navigation.txt 2014-11-27 22:13:36 +0000 |
218 | +++ lib/lp/bugs/stories/bug-release-management/nomination-navigation.txt 2015-06-27 04:40:18 +0000 |
219 | @@ -11,7 +11,7 @@ |
220 | ... 'http://bugs.launchpad.dev/ubuntu/+source/mozilla-firefox/+bug/1' |
221 | ... '/nominations/2/+editstatus') |
222 | >>> print_location(admin_browser.contents) |
223 | - Hierarchy: Ubuntu Linux > mozilla-firefox package > Bug #1... |
224 | + Hierarchy: Ubuntu > mozilla-firefox package > Bug #1... |
225 | Tabs: |
226 | * Overview - http://launchpad.dev/ubuntu/+source/mozilla-firefox |
227 | * Code - http://code.launchpad.dev/ubuntu/+source/mozilla-firefox |
228 | |
229 | === modified file 'lib/lp/bugs/stories/bugs/xx-bug-activity.txt' |
230 | --- lib/lp/bugs/stories/bugs/xx-bug-activity.txt 2014-11-27 22:13:36 +0000 |
231 | +++ lib/lp/bugs/stories/bugs/xx-bug-activity.txt 2015-06-27 04:40:18 +0000 |
232 | @@ -12,7 +12,7 @@ |
233 | the main heading repeats the bug number for clarity: |
234 | |
235 | >>> print_location(anon_browser.contents) |
236 | - Hierarchy: Debian GNU/Linux > mozilla-firefox package > Bug #3... |
237 | + Hierarchy: Debian > mozilla-firefox package > Bug #3... |
238 | Tabs: |
239 | * Overview - http://launchpad.dev/debian/+source/mozilla-firefox |
240 | * Code - http://code.launchpad.dev/debian/+source/mozilla-firefox |
241 | |
242 | === modified file 'lib/lp/bugs/stories/bugs/xx-bug-index.txt' |
243 | --- lib/lp/bugs/stories/bugs/xx-bug-index.txt 2014-11-27 22:13:36 +0000 |
244 | +++ lib/lp/bugs/stories/bugs/xx-bug-index.txt 2015-06-27 04:40:18 +0000 |
245 | @@ -14,7 +14,7 @@ |
246 | The breadcrumbs and other navigation include a link to the bug itself. |
247 | |
248 | >>> print_location(anon_browser.contents) |
249 | - Hierarchy: Debian GNU/Linux > mozilla-firefox package |
250 | + Hierarchy: Debian > mozilla-firefox package |
251 | Tabs: |
252 | * Overview - http://launchpad.dev/debian/+source/mozilla-firefox |
253 | * Code - http://code.launchpad.dev/debian/+source/mozilla-firefox |
254 | |
255 | === modified file 'lib/lp/bugs/stories/bugtask-management/xx-change-assignee.txt' |
256 | --- lib/lp/bugs/stories/bugtask-management/xx-change-assignee.txt 2012-08-16 05:18:54 +0000 |
257 | +++ lib/lp/bugs/stories/bugtask-management/xx-change-assignee.txt 2015-06-27 04:40:18 +0000 |
258 | @@ -61,10 +61,8 @@ |
259 | >>> print extract_text( |
260 | ... first_tag_by_class(admin_browser.contents, 'warning message')) |
261 | Celso Providelo |
262 | - did not previously have any assigned bugs in |
263 | - Jokosher Audio Editor. |
264 | - If this bug was assigned by mistake, |
265 | - you may change the assignment. |
266 | + did not previously have any assigned bugs in Jokosher. |
267 | + If this bug was assigned by mistake, you may change the assignment. |
268 | |
269 | When assigning a bug to oneself, though, the warning message is suppreseed. |
270 | |
271 | |
272 | === modified file 'lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt' |
273 | --- lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt 2013-09-27 04:13:23 +0000 |
274 | +++ lib/lp/bugs/stories/bugtracker/xx-bugtracker.txt 2015-06-27 04:40:18 +0000 |
275 | @@ -416,8 +416,7 @@ |
276 | >>> print extract_text(find_tag_by_id( |
277 | ... user_browser.contents, 'bugtracker-delete-not-possible-reasons')) |
278 | Please note, this bug tracker cannot be deleted because: |
279 | - This is the bug tracker for The GNOME Project and The GNOME Terminal |
280 | - Emulator. |
281 | + This is the bug tracker for GNOME and GNOME Terminal. |
282 | There are linked bug watches and only members of ...Launchpad |
283 | Administrators... |
284 | |
285 | |
286 | === modified file 'lib/lp/bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt' |
287 | --- lib/lp/bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt 2012-12-10 13:43:47 +0000 |
288 | +++ lib/lp/bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt 2015-06-27 04:40:18 +0000 |
289 | @@ -19,7 +19,7 @@ |
290 | ... 'http://bugs.launchpad.dev/ubuntu/+subscribe') |
291 | >>> print extract_text(find_portlet(browser.contents, 'Subscribers')) |
292 | Subscribers |
293 | - To all Ubuntu Linux bugs: |
294 | + To all Ubuntu bugs: |
295 | Landscape Developers |
296 | |
297 | And subscribe some people to the Firefox source package in ubuntu. |
298 | @@ -50,7 +50,7 @@ |
299 | Foo Bar |
300 | Landscape Developers |
301 | Sample Person |
302 | - To all Ubuntu Linux bugs: |
303 | + To all Ubuntu bugs: |
304 | Landscape Developers |
305 | |
306 | Sample Person can also unsubscribe himself and the Landscape team. |
307 | @@ -67,7 +67,7 @@ |
308 | Subscribers |
309 | To all bugs in mozilla-firefox in Ubuntu: |
310 | Foo Bar |
311 | - To all Ubuntu Linux bugs: |
312 | + To all Ubuntu bugs: |
313 | Landscape Developers |
314 | |
315 | |
316 | @@ -115,7 +115,7 @@ |
317 | To all bugs in mozilla-firefox in Ubuntu: |
318 | Foo Bar |
319 | No Privileges Person |
320 | - To all Ubuntu Linux bugs: |
321 | + To all Ubuntu bugs: |
322 | Landscape Developers |
323 | |
324 | ...has an entry in the "Remove subscriptions" list... |
325 | @@ -136,7 +136,7 @@ |
326 | Subscribers |
327 | To all bugs in mozilla-firefox in Ubuntu: |
328 | Foo Bar |
329 | - To all Ubuntu Linux bugs: |
330 | + To all Ubuntu bugs: |
331 | Landscape Developers |
332 | |
333 | The checkbox to unsubscribe No Privileges Person is no longer present on |
334 | @@ -162,7 +162,7 @@ |
335 | Subscribers |
336 | To all bugs in mozilla-firefox in Ubuntu: |
337 | Foo Bar |
338 | - To all Ubuntu Linux bugs: |
339 | + To all Ubuntu bugs: |
340 | Landscape Developers |
341 | |
342 | >>> remove_other = browser.getControl('\xa0Foo Bar') |
343 | @@ -176,7 +176,7 @@ |
344 | Subscribers |
345 | To all bugs in mozilla-firefox in Ubuntu: |
346 | Foo Bar |
347 | - To all Ubuntu Linux bugs: |
348 | + To all Ubuntu bugs: |
349 | Landscape Developers |
350 | |
351 | When Sample Person now visits the bug subscription page, he no longer sees |
352 | |
353 | === modified file 'lib/lp/code/stories/branches/xx-branch-index.txt' |
354 | --- lib/lp/code/stories/branches/xx-branch-index.txt 2014-11-27 07:48:25 +0000 |
355 | +++ lib/lp/code/stories/branches/xx-branch-index.txt 2015-06-27 04:40:18 +0000 |
356 | @@ -426,7 +426,7 @@ |
357 | >>> browser.open( |
358 | ... 'http://code.launchpad.dev/~name12/gnome-terminal/scanned') |
359 | >>> print_location(browser.contents) |
360 | - Hierarchy: The GNOME Terminal Emulator |
361 | + Hierarchy: GNOME Terminal |
362 | Tabs: |
363 | * Overview - http://launchpad.dev/gnome-terminal |
364 | * Code (selected) - http://code.launchpad.dev/gnome-terminal |
365 | |
366 | === modified file 'lib/lp/code/stories/branches/xx-product-branches.txt' |
367 | --- lib/lp/code/stories/branches/xx-product-branches.txt 2015-06-15 08:35:10 +0000 |
368 | +++ lib/lp/code/stories/branches/xx-product-branches.txt 2015-06-27 04:40:18 +0000 |
369 | @@ -37,7 +37,7 @@ |
370 | ... return find_tag_by_id(browser.contents, 'branch-summary') |
371 | >>> summary = get_summary(browser) |
372 | >>> print extract_text(summary) |
373 | - Launchpad does not know where The Gnome Panel Applets |
374 | + Launchpad does not know where Gnome Applets |
375 | hosts its code. |
376 | There are no branches for Gnome Applets |
377 | in Launchpad. |
378 | @@ -67,7 +67,7 @@ |
379 | |
380 | >>> browser.open('http://code.launchpad.dev/netapplet') |
381 | >>> print extract_text(get_summary(browser)) |
382 | - Launchpad does not know where Network Applet hosts its code... |
383 | + Launchpad does not know where NetApplet hosts its code... |
384 | There are no branches for NetApplet in Launchpad. |
385 | ... |
386 | There are download files available for NetApplet. |
387 | @@ -88,10 +88,8 @@ |
388 | >>> browser.open('http://code.launchpad.dev/evolution') |
389 | >>> summary = get_summary(browser) |
390 | >>> print extract_text(get_summary(browser)) |
391 | - The Evolution Groupware Application hosts its code |
392 | - externally. |
393 | - You can learn more at the project's |
394 | - web page. |
395 | + Evolution hosts its code externally. |
396 | + You can learn more at the project's web page. |
397 | Launchpad imports the master branch and you can create branches from |
398 | it. |
399 | You can |
400 | |
401 | === modified file 'lib/lp/registry/browser/distribution.py' |
402 | --- lib/lp/registry/browser/distribution.py 2015-06-12 06:34:19 +0000 |
403 | +++ lib/lp/registry/browser/distribution.py 2015-06-27 04:40:18 +0000 |
404 | @@ -824,7 +824,6 @@ |
405 | field_names = [ |
406 | "name", |
407 | "displayname", |
408 | - "title", |
409 | "summary", |
410 | "description", |
411 | "domainname", |
412 | @@ -867,7 +866,7 @@ |
413 | distribution = getUtility(IDistributionSet).new( |
414 | name=data['name'], |
415 | displayname=data['displayname'], |
416 | - title=data['title'], |
417 | + title=data['displayname'], |
418 | summary=data['summary'], |
419 | description=data['description'], |
420 | domainname=data['domainname'], |
421 | @@ -890,7 +889,6 @@ |
422 | schema = IDistribution |
423 | field_names = [ |
424 | 'displayname', |
425 | - 'title', |
426 | 'summary', |
427 | 'description', |
428 | 'bug_reporting_guidelines', |
429 | |
430 | === modified file 'lib/lp/registry/browser/product.py' |
431 | --- lib/lp/registry/browser/product.py 2015-06-25 03:33:33 +0000 |
432 | +++ lib/lp/registry/browser/product.py 2015-06-27 04:40:18 +0000 |
433 | @@ -2170,7 +2170,7 @@ |
434 | |
435 | schema = IProduct |
436 | product = None |
437 | - field_names = ['name', 'displayname', 'title', 'summary', |
438 | + field_names = ['name', 'displayname', 'summary', |
439 | 'description', 'homepageurl', 'sourceforgeproject', |
440 | 'wikiurl', 'screenshotsurl', |
441 | 'downloadurl', 'programminglang', |
442 | @@ -2203,7 +2203,7 @@ |
443 | class ProjectAddStepOne(StepView): |
444 | """product/+new view class for creating a new project.""" |
445 | |
446 | - _field_names = ['displayname', 'name', 'title', 'summary'] |
447 | + _field_names = ['displayname', 'name', 'summary'] |
448 | label = "Register a project in Launchpad" |
449 | schema = IProduct |
450 | step_name = 'projectaddstep1' |
451 | @@ -2259,7 +2259,7 @@ |
452 | class ProjectAddStepTwo(StepView, ProductLicenseMixin, ReturnToReferrerMixin): |
453 | """Step 2 (of 2) in the +new project add wizard.""" |
454 | |
455 | - _field_names = ['displayname', 'name', 'title', 'summary', 'description', |
456 | + _field_names = ['displayname', 'name', 'summary', 'description', |
457 | 'homepageurl', 'information_type', 'licenses', |
458 | 'license_info', 'driver', 'bug_supervisor', 'owner'] |
459 | schema = IProduct |
460 | @@ -2488,7 +2488,7 @@ |
461 | owner=owner, |
462 | name=data['name'], |
463 | displayname=data['displayname'], |
464 | - title=data['title'], |
465 | + title=data['displayname'], |
466 | summary=data['summary'], |
467 | description=description, |
468 | homepageurl=data.get('homepageurl'), |
469 | |
470 | === modified file 'lib/lp/registry/browser/project.py' |
471 | --- lib/lp/registry/browser/project.py 2015-01-29 16:28:30 +0000 |
472 | +++ lib/lp/registry/browser/project.py 2015-06-27 04:40:18 +0000 |
473 | @@ -387,7 +387,7 @@ |
474 | page_title = label |
475 | schema = IProjectGroup |
476 | field_names = [ |
477 | - 'displayname', 'title', 'summary', 'description', |
478 | + 'displayname', 'summary', 'description', |
479 | 'bug_reporting_guidelines', 'bug_reported_acknowledgement', |
480 | 'homepageurl', 'bugtracker', 'sourceforgeproject', |
481 | 'wikiurl'] |
482 | @@ -493,7 +493,7 @@ |
483 | return getUtility(IProductSet).createProduct( |
484 | owner=self.user, |
485 | name=data['name'], |
486 | - title=data['title'], |
487 | + title=data['displayname'], |
488 | summary=data['summary'], |
489 | displayname=data['displayname'], |
490 | licenses=data['licenses'], |
491 | @@ -582,7 +582,6 @@ |
492 | field_names = [ |
493 | 'name', |
494 | 'displayname', |
495 | - 'title', |
496 | 'summary', |
497 | 'description', |
498 | 'owner', |
499 | @@ -599,7 +598,7 @@ |
500 | self.projectgroup = getUtility(IProjectGroupSet).new( |
501 | name=data['name'].lower().strip(), |
502 | displayname=data['displayname'], |
503 | - title=data['title'], |
504 | + title=data['displayname'], |
505 | homepageurl=data['homepageurl'], |
506 | summary=data['summary'], |
507 | description=data['description'], |
508 | |
509 | === modified file 'lib/lp/registry/browser/tests/distribution-views.txt' |
510 | --- lib/lp/registry/browser/tests/distribution-views.txt 2015-05-15 12:40:45 +0000 |
511 | +++ lib/lp/registry/browser/tests/distribution-views.txt 2015-06-27 04:40:18 +0000 |
512 | @@ -66,7 +66,7 @@ |
513 | The view accepts the basic fields to register a distribution. |
514 | |
515 | >>> view.field_names |
516 | - ['name', 'displayname', 'title', 'summary', 'description', 'domainname', |
517 | + ['name', 'displayname', 'summary', 'description', 'domainname', |
518 | 'members', 'official_malone', 'blueprints_usage', 'translations_usage', |
519 | 'answers_usage'] |
520 | |
521 | @@ -74,7 +74,6 @@ |
522 | >>> form = { |
523 | ... 'field.name': 'youbuntu', |
524 | ... 'field.displayname': 'YoUbuntu', |
525 | - ... 'field.title': 'YoUbuntu OS', |
526 | ... 'field.summary': 'summary', |
527 | ... 'field.description': 'description', |
528 | ... 'field.domainname': 'youbuntu.me', |
529 | @@ -128,7 +127,7 @@ |
530 | <DBItem ServiceUsage.UNKNOWN, (10) Unknown> |
531 | |
532 | >>> view.field_names |
533 | - ['displayname', 'title', 'summary', 'description', |
534 | + ['displayname', 'summary', 'description', |
535 | 'bug_reporting_guidelines', 'bug_reported_acknowledgement', |
536 | 'package_derivatives_email', 'icon', |
537 | 'logo', 'mugshot', 'official_malone', 'enable_bug_expiration', |
538 | @@ -354,7 +353,7 @@ |
539 | |
540 | >>> view = create_view(ubuntu, name='+ppas') |
541 | >>> print view.label |
542 | - Personal Package Archives for Ubuntu Linux |
543 | + Personal Package Archives for Ubuntu |
544 | |
545 | # The leaf of the breadcrumbs, also used in the page-title. |
546 | >>> print view.page_title |
547 | |
548 | === modified file 'lib/lp/registry/browser/tests/distributionmirror-views.txt' |
549 | --- lib/lp/registry/browser/tests/distributionmirror-views.txt 2014-07-07 03:42:43 +0000 |
550 | +++ lib/lp/registry/browser/tests/distributionmirror-views.txt 2015-06-27 04:40:18 +0000 |
551 | @@ -36,10 +36,10 @@ |
552 | The view provides a label, page_title, and cancel_url |
553 | |
554 | >>> print view.label |
555 | - Register a new mirror for Ubuntu Linux |
556 | + Register a new mirror for Ubuntu |
557 | |
558 | >>> print view.page_title |
559 | - Register a new mirror for Ubuntu Linux |
560 | + Register a new mirror for Ubuntu |
561 | |
562 | >>> print view.cancel_url |
563 | http://launchpad.dev/ubuntu |
564 | |
565 | === modified file 'lib/lp/registry/browser/tests/test_product.py' |
566 | --- lib/lp/registry/browser/tests/test_product.py 2015-06-25 08:59:07 +0000 |
567 | +++ lib/lp/registry/browser/tests/test_product.py 2015-06-27 04:40:18 +0000 |
568 | @@ -128,7 +128,6 @@ |
569 | 'field.__visited_steps__': ProjectAddStepOne.step_name, |
570 | 'field.displayname': 'Fnord', |
571 | 'field.name': 'fnord', |
572 | - 'field.title': 'fnord', |
573 | 'field.summary': 'fnord summary', |
574 | } |
575 | else: |
576 | @@ -138,7 +137,6 @@ |
577 | ProjectAddStepOne.step_name, ProjectAddStepTwo.step_name), |
578 | 'field.displayname': 'Fnord', |
579 | 'field.name': 'fnord', |
580 | - 'field.title': 'fnord', |
581 | 'field.summary': 'fnord summary', |
582 | 'field.disclaim_maintainer': 'off', |
583 | } |
584 | @@ -205,13 +203,13 @@ |
585 | disclaim_widget = view.view.widgets['disclaim_maintainer'] |
586 | self.assertEqual('subordinate', disclaim_widget.cssClass) |
587 | self.assertEqual( |
588 | - ['displayname', 'name', 'title', 'summary', 'description', |
589 | + ['displayname', 'name', 'summary', 'description', |
590 | 'homepageurl', 'information_type', 'licenses', 'license_info', |
591 | 'driver', 'bug_supervisor', 'owner', |
592 | '__visited_steps__'], |
593 | view.view.field_names) |
594 | self.assertEqual( |
595 | - ['displayname', 'name', 'title', 'summary', 'description', |
596 | + ['displayname', 'name', 'summary', 'description', |
597 | 'homepageurl', 'information_type', 'licenses', 'driver', |
598 | 'bug_supervisor', 'owner', 'disclaim_maintainer', |
599 | 'source_package_name', 'distroseries', '__visited_steps__', |
600 | |
601 | === modified file 'lib/lp/registry/configure.zcml' |
602 | --- lib/lp/registry/configure.zcml 2015-05-13 05:25:30 +0000 |
603 | +++ lib/lp/registry/configure.zcml 2015-06-27 04:40:18 +0000 |
604 | @@ -1322,7 +1322,6 @@ |
605 | screenshotsurl |
606 | sourceforgeproject |
607 | summary |
608 | - title |
609 | vcs |
610 | wikiurl" |
611 | /> |
612 | @@ -1736,7 +1735,6 @@ |
613 | package_derivatives_email |
614 | redirect_release_uploads |
615 | summary |
616 | - title |
617 | vcs |
618 | "/> |
619 | <require |
620 | |
621 | === modified file 'lib/lp/registry/doc/person-karma.txt' |
622 | --- lib/lp/registry/doc/person-karma.txt 2012-12-26 01:32:19 +0000 |
623 | +++ lib/lp/registry/doc/person-karma.txt 2015-06-27 04:40:18 +0000 |
624 | @@ -98,9 +98,9 @@ |
625 | >>> for contrib in foobar.getProjectsAndCategoriesContributedTo(None): |
626 | ... categories = sorted(cat.name for cat in contrib['categories']) |
627 | ... print contrib['project'].title, categories |
628 | - The Evolution Groupware Application [u'bugs', u'translations'] |
629 | - Ubuntu Linux [u'bugs'] |
630 | - Gnome Baker [u'bugs'] |
631 | + Evolution [u'bugs', u'translations'] |
632 | + Ubuntu [u'bugs'] |
633 | + gnomebaker [u'bugs'] |
634 | Mozilla Thunderbird [u'bugs'] |
635 | Mozilla Firefox [u'bugs'] |
636 | |
637 | |
638 | === modified file 'lib/lp/registry/doc/pillar.txt' |
639 | --- lib/lp/registry/doc/pillar.txt 2015-01-29 13:09:37 +0000 |
640 | +++ lib/lp/registry/doc/pillar.txt 2015-06-27 04:40:18 +0000 |
641 | @@ -195,11 +195,11 @@ |
642 | >>> for row in pillar_set.search('ubuntu', limit=5): |
643 | ... print ("%s: %s (%s)" |
644 | ... % (row.__class__.__name__, row.title, row.name)) |
645 | - Distribution: Ubuntu Linux (ubuntu) |
646 | - Distribution: Ubuntu Test (ubuntutest) |
647 | - ProductWithLicenses: The Evolution Groupware Application (evolution) |
648 | + Distribution: Ubuntu (ubuntu) |
649 | + Distribution: ubuntutest (ubuntutest) |
650 | + ProductWithLicenses: Evolution (evolution) |
651 | ProductWithLicenses: Tomcat (tomcat) |
652 | - ProductWithLicenses: The Gnome Panel Applets (applets) |
653 | + ProductWithLicenses: Gnome Applets (applets) |
654 | |
655 | We can search by any of the pillar's aliases too. |
656 | |
657 | @@ -221,11 +221,11 @@ |
658 | >>> for row in pillar_set.search('ubuntu', limit=5): |
659 | ... print ("%s: %s (%s)" |
660 | ... % (row.__class__.__name__, row.title, row.name)) |
661 | - Distribution: Ubuntu Linux (ubuntu) |
662 | - Distribution: Ubuntu Test (ubuntutest) |
663 | - ProductWithLicenses: The Evolution Groupware Application (evolution) |
664 | + Distribution: Ubuntu (ubuntu) |
665 | + Distribution: ubuntutest (ubuntutest) |
666 | + ProductWithLicenses: Evolution (evolution) |
667 | ProductWithLicenses: Tomcat (tomcat) |
668 | - Distribution: GuadaLinex: Linux for Andalucia (guadalinex) |
669 | + Distribution: GuadaLinex (guadalinex) |
670 | |
671 | |
672 | == PillarName objects == |
673 | |
674 | === modified file 'lib/lp/registry/doc/product.txt' |
675 | --- lib/lp/registry/doc/product.txt 2015-05-14 13:57:51 +0000 |
676 | +++ lib/lp/registry/doc/product.txt 2015-06-27 04:40:18 +0000 |
677 | @@ -183,8 +183,8 @@ |
678 | |
679 | >>> for product in productset.getTranslatables(): |
680 | ... print product.name |
681 | + evolution |
682 | alsa-utils |
683 | - evolution |
684 | |
685 | Only active products are listed as translatables. |
686 | |
687 | |
688 | === modified file 'lib/lp/registry/doc/projectgroup.txt' |
689 | --- lib/lp/registry/doc/projectgroup.txt 2015-01-29 16:28:30 +0000 |
690 | +++ lib/lp/registry/doc/projectgroup.txt 2015-06-27 04:40:18 +0000 |
691 | @@ -366,7 +366,7 @@ |
692 | |
693 | >>> evolution = translatables[0] |
694 | >>> print evolution.title |
695 | - The Evolution Groupware Application |
696 | + Evolution |
697 | |
698 | With its 'trunk' series translatable. |
699 | |
700 | @@ -386,7 +386,7 @@ |
701 | |
702 | >>> netapplet = gnome.getProduct('netapplet') |
703 | >>> print netapplet.title |
704 | - Network Applet |
705 | + NetApplet |
706 | |
707 | But it was not returned from 'translatables' method because it's not using |
708 | Rosetta officially. |
709 | |
710 | === modified file 'lib/lp/registry/doc/vocabularies.txt' |
711 | --- lib/lp/registry/doc/vocabularies.txt 2014-05-19 11:33:05 +0000 |
712 | +++ lib/lp/registry/doc/vocabularies.txt 2015-06-27 04:40:18 +0000 |
713 | @@ -1100,10 +1100,11 @@ |
714 | |
715 | >>> vocab = get_naked_vocab(None, "DistributionOrProduct") |
716 | >>> for term in vocab: |
717 | - ... if 'Ubuntu' in term.title: |
718 | + ... if 'buntu' in term.title: |
719 | ... print term.title, '- class', term.value.__class__.__name__ |
720 | - Ubuntu Linux - class Distribution |
721 | - Ubuntu Test - class Distribution |
722 | + Kubuntu - class Distribution |
723 | + Ubuntu - class Distribution |
724 | + ubuntutest - class Distribution |
725 | |
726 | They can be looked up by their aliases too. |
727 | |
728 | @@ -1167,10 +1168,11 @@ |
729 | |
730 | >>> vocab = get_naked_vocab(None, "DistributionOrProductOrProjectGroup") |
731 | >>> for term in vocab: |
732 | - ... if 'Ubuntu' in term.title: |
733 | + ... if 'buntu' in term.title: |
734 | ... print term.title, '- class', term.value.__class__.__name__ |
735 | - Ubuntu Linux - class Distribution |
736 | - Ubuntu Test - class Distribution |
737 | + Kubuntu - class Distribution |
738 | + Ubuntu - class Distribution |
739 | + ubuntutest - class Distribution |
740 | |
741 | They can be looked up by their aliases too. |
742 | |
743 | @@ -1242,16 +1244,16 @@ |
744 | 9 |
745 | |
746 | >>> for term in featured_project_vocabulary: |
747 | - ... print term.token, term.value.displayname, term.title |
748 | - applets Gnome Applets The Gnome Panel Applets |
749 | - bazaar Bazaar Bazaar |
750 | - firefox Mozilla Firefox Mozilla Firefox |
751 | - gentoo Gentoo The Gentoo Linux |
752 | - gnome GNOME The GNOME Project |
753 | - gnome-terminal GNOME Terminal The GNOME Terminal Emulator |
754 | - mozilla The Mozilla Project The Mozilla Project |
755 | - thunderbird Mozilla Thunderbird Mozilla Thunderbird |
756 | - ubuntu Ubuntu Ubuntu Linux |
757 | + ... print term.token, term.title |
758 | + applets Gnome Applets |
759 | + bazaar Bazaar |
760 | + firefox Mozilla Firefox |
761 | + gentoo Gentoo |
762 | + gnome GNOME |
763 | + gnome-terminal GNOME Terminal |
764 | + mozilla The Mozilla Project |
765 | + thunderbird Mozilla Thunderbird |
766 | + ubuntu Ubuntu |
767 | |
768 | >>> ubuntu = getUtility(ILaunchpadCelebrities).ubuntu |
769 | >>> ubuntu in featured_project_vocabulary |
770 | |
771 | === modified file 'lib/lp/registry/interfaces/product.py' |
772 | --- lib/lp/registry/interfaces/product.py 2015-06-24 21:14:20 +0000 |
773 | +++ lib/lp/registry/interfaces/product.py 2015-06-27 04:40:18 +0000 |
774 | @@ -468,7 +468,8 @@ |
775 | title = exported( |
776 | Title( |
777 | title=_('Title'), |
778 | - description=_("The project title. Should be just a few words."))) |
779 | + description=_("The project title. Should be just a few words."), |
780 | + readonly=True)) |
781 | |
782 | |
783 | class IProductView( |
784 | |
785 | === modified file 'lib/lp/registry/model/distribution.py' |
786 | --- lib/lp/registry/model/distribution.py 2015-05-12 07:20:13 +0000 |
787 | +++ lib/lp/registry/model/distribution.py 2015-06-27 04:40:18 +0000 |
788 | @@ -202,7 +202,7 @@ |
789 | |
790 | name = StringCol(notNull=True, alternateID=True, unique=True) |
791 | displayname = StringCol(notNull=True) |
792 | - title = StringCol(notNull=True) |
793 | + _title = StringCol(dbName='title', notNull=True) |
794 | summary = StringCol(notNull=True) |
795 | description = StringCol(notNull=True) |
796 | homepage_content = StringCol(default=None) |
797 | @@ -256,6 +256,10 @@ |
798 | self.__class__.__name__, displayname, self.name) |
799 | |
800 | @property |
801 | + def title(self): |
802 | + return self.displayname |
803 | + |
804 | + @property |
805 | def pillar(self): |
806 | """See `IBugTarget`.""" |
807 | return self |
808 | @@ -1453,7 +1457,7 @@ |
809 | distro = Distribution( |
810 | name=name, |
811 | displayname=displayname, |
812 | - title=title, |
813 | + _title=title, |
814 | description=description, |
815 | summary=summary, |
816 | domainname=domainname, |
817 | |
818 | === modified file 'lib/lp/registry/model/product.py' |
819 | --- lib/lp/registry/model/product.py 2015-06-24 21:14:20 +0000 |
820 | +++ lib/lp/registry/model/product.py 2015-06-27 04:40:18 +0000 |
821 | @@ -397,7 +397,7 @@ |
822 | name = StringCol( |
823 | dbName='name', notNull=True, alternateID=True, unique=True) |
824 | displayname = StringCol(dbName='displayname', notNull=True) |
825 | - title = StringCol(dbName='title', notNull=True) |
826 | + _title = StringCol(dbName='title', notNull=True) |
827 | summary = StringCol(dbName='summary', notNull=True) |
828 | description = StringCol(notNull=False, default=None) |
829 | datecreated = UtcDateTimeCol( |
830 | @@ -440,6 +440,10 @@ |
831 | vcs = EnumCol(enum=VCSType, notNull=False) |
832 | |
833 | @property |
834 | + def title(self): |
835 | + return self.displayname |
836 | + |
837 | + @property |
838 | def date_next_suggest_packaging(self): |
839 | """See `IProduct` |
840 | |
841 | @@ -1883,7 +1887,7 @@ |
842 | ' Projects.') |
843 | product = Product( |
844 | owner=owner, registrant=registrant, name=name, |
845 | - displayname=displayname, title=title, projectgroup=projectgroup, |
846 | + displayname=displayname, _title=title, projectgroup=projectgroup, |
847 | summary=summary, description=description, homepageurl=homepageurl, |
848 | screenshotsurl=screenshotsurl, wikiurl=wikiurl, |
849 | downloadurl=downloadurl, freshmeatproject=None, |
850 | @@ -2067,7 +2071,7 @@ |
851 | POTemplate.productseriesID == ProductSeries.id, |
852 | Product.translations_usage == ServiceUsage.LAUNCHPAD, |
853 | Person.id == Product._ownerID).config( |
854 | - distinct=True).order_by(Product.title) |
855 | + distinct=True).order_by(Product.displayname) |
856 | |
857 | # We only want Product - the other tables are just to populate |
858 | # the cache. |
859 | |
860 | === modified file 'lib/lp/registry/model/projectgroup.py' |
861 | --- lib/lp/registry/model/projectgroup.py 2015-01-29 16:28:30 +0000 |
862 | +++ lib/lp/registry/model/projectgroup.py 2015-06-27 04:40:18 +0000 |
863 | @@ -128,7 +128,7 @@ |
864 | storm_validator=validate_public_person, notNull=True) |
865 | name = StringCol(dbName='name', notNull=True) |
866 | displayname = StringCol(dbName='displayname', notNull=True) |
867 | - title = StringCol(dbName='title', notNull=True) |
868 | + _title = StringCol(dbName='title', notNull=True) |
869 | summary = StringCol(dbName='summary', notNull=True) |
870 | description = StringCol(dbName='description', notNull=True) |
871 | datecreated = UtcDateTimeCol(dbName='datecreated', notNull=True, |
872 | @@ -163,6 +163,10 @@ |
873 | bug_reported_acknowledgement = StringCol(default=None) |
874 | |
875 | @property |
876 | + def title(self): |
877 | + return self.displayname |
878 | + |
879 | + @property |
880 | def pillar_category(self): |
881 | """See `IPillar`.""" |
882 | return "Project Group" |
883 | @@ -555,7 +559,7 @@ |
884 | return ProjectGroup( |
885 | name=name, |
886 | displayname=displayname, |
887 | - title=title, |
888 | + _title=title, |
889 | summary=summary, |
890 | description=description, |
891 | homepageurl=homepageurl, |
892 | |
893 | === modified file 'lib/lp/registry/stories/milestone/object-milestones.txt' |
894 | --- lib/lp/registry/stories/milestone/object-milestones.txt 2014-11-27 07:48:25 +0000 |
895 | +++ lib/lp/registry/stories/milestone/object-milestones.txt 2015-06-27 04:40:18 +0000 |
896 | @@ -180,7 +180,7 @@ |
897 | 3.1 : Debian |
898 | |
899 | >>> print_location(anon_browser.contents) |
900 | - Hierarchy: Debian GNU/Linux |
901 | + Hierarchy: Debian |
902 | Tabs: |
903 | * Overview (selected) - http://launchpad.dev/debian |
904 | * Code - http://code.launchpad.dev/debian |
905 | |
906 | === modified file 'lib/lp/registry/stories/object/xx-karmacontext-topcontributors.txt' |
907 | --- lib/lp/registry/stories/object/xx-karmacontext-topcontributors.txt 2009-11-22 15:43:16 +0000 |
908 | +++ lib/lp/registry/stories/object/xx-karmacontext-topcontributors.txt 2015-06-27 04:40:18 +0000 |
909 | @@ -20,7 +20,7 @@ |
910 | |
911 | >>> anon_browser.getLink('More contributors').click() |
912 | >>> print anon_browser.title |
913 | - Top Ubuntu Linux Contributors... |
914 | + Top Ubuntu Contributors... |
915 | |
916 | |
917 | Top contributors of a product |
918 | |
919 | === modified file 'lib/lp/registry/stories/object/xx-nameblacklist.txt' |
920 | --- lib/lp/registry/stories/object/xx-nameblacklist.txt 2014-01-30 15:04:06 +0000 |
921 | +++ lib/lp/registry/stories/object/xx-nameblacklist.txt 2015-06-27 04:40:18 +0000 |
922 | @@ -7,7 +7,6 @@ |
923 | >>> admin_browser.open('http://launchpad.dev/projectgroups/+new') |
924 | >>> admin_browser.getControl('Name', index=0).value = 'blacklisted' |
925 | >>> admin_browser.getControl('Display Name').value = 'Whatever' |
926 | - >>> admin_browser.getControl('Title').value = 'Whatever' |
927 | >>> admin_browser.getControl('Project Group Summary').value = 'Whatever' |
928 | >>> admin_browser.getControl('Description').value = 'Whatever' |
929 | >>> admin_browser.getControl('Add').click() |
930 | |
931 | === modified file 'lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt' |
932 | --- lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt 2012-06-14 10:34:55 +0000 |
933 | +++ lib/lp/registry/stories/packaging/xx-sourcepackage-packaging.txt 2015-06-27 04:40:18 +0000 |
934 | @@ -84,8 +84,6 @@ |
935 | bonkers |
936 | >>> print user_browser.getControl(name='field.displayname').value |
937 | Bonkers |
938 | - >>> print user_browser.getControl(name='field.title').value |
939 | - Bonkers |
940 | >>> print user_browser.getControl(name='field.summary').value |
941 | summary for flubber-bin |
942 | summary for flubber-lib |
943 | @@ -110,8 +108,6 @@ |
944 | bonkers |
945 | >>> print user_browser.getControl(name='field.displayname').value |
946 | Bonkers |
947 | - >>> print user_browser.getControl(name='field.title').value |
948 | - Bonkers |
949 | >>> print user_browser.getControl(name='field.summary').value |
950 | summary for flubber-bin |
951 | summary for flubber-lib |
952 | |
953 | === modified file 'lib/lp/registry/stories/person/xx-person-projects.txt' |
954 | --- lib/lp/registry/stories/person/xx-person-projects.txt 2012-10-24 00:44:43 +0000 |
955 | +++ lib/lp/registry/stories/person/xx-person-projects.txt 2015-06-27 04:40:18 +0000 |
956 | @@ -23,8 +23,8 @@ |
957 | ... anon_browser.contents, 'related-projects') |
958 | >>> print extract_text(related_projects) |
959 | Name Owner Driver Bug Supervisor |
960 | - Ubuntu Linux yes no no |
961 | - Ubuntu Test yes no no |
962 | + Ubuntu yes no no |
963 | + ubuntutest yes no no |
964 | Tomcat yes no no |
965 | |
966 | |
967 | @@ -43,8 +43,8 @@ |
968 | ... anon_browser.contents, 'related-projects') |
969 | >>> print extract_text(related_projects) |
970 | Name Owner Driver Bug Supervisor |
971 | - Debian GNU/Linux yes no no |
972 | - The Gentoo Linux yes no no |
973 | - Kubuntu - Free KDE-based Linux yes no no |
974 | - Redhat Advanced Server yes no no |
975 | + Debian yes no no |
976 | + Gentoo yes no no |
977 | + Kubuntu yes no no |
978 | + Red Hat yes no no |
979 | Apache yes no no |
980 | |
981 | === modified file 'lib/lp/registry/stories/product/xx-product-add.txt' |
982 | --- lib/lp/registry/stories/product/xx-product-add.txt 2012-07-06 22:36:12 +0000 |
983 | +++ lib/lp/registry/stories/product/xx-product-add.txt 2015-06-27 04:40:18 +0000 |
984 | @@ -50,16 +50,13 @@ |
985 | >>> user_browser.getControl('Continue').click() |
986 | |
987 | >>> print_errors(user_browser.contents) |
988 | - There are 3 errors. |
989 | + There are 2 errors. |
990 | URL: |
991 | http://launchpad.dev/ |
992 | Invalid name 'aard vark'. Names must be at least two characters ... |
993 | At least one lowercase letter or number, followed by letters, numbers, |
994 | dots, hyphens or pluses. Keep this name short; it is used in URLs as |
995 | shown above. |
996 | - Title: |
997 | - Required input is missing. |
998 | - The project title. Should be just a few words. |
999 | Summary: |
1000 | Required input is missing. |
1001 | A short paragraph to introduce the project's work. |
1002 | @@ -68,7 +65,6 @@ |
1003 | correctly this time. |
1004 | |
1005 | >>> user_browser.getControl('URL').value = 'aardvark' |
1006 | - >>> user_browser.getControl('Title').value = 'The Aardvark Center' |
1007 | >>> user_browser.getControl('Summary').value = ( |
1008 | ... 'A project designed to placate ornery aardvarks') |
1009 | |
1010 | @@ -92,10 +88,9 @@ |
1011 | >>> print user_browser.getControl(name='field.name').value |
1012 | aardvark |
1013 | |
1014 | -Sample Person is given the opportunity though to change the title and |
1015 | -summary. She can also add a longer description. |
1016 | +Sample Person is given the opportunity though to change the summary. |
1017 | +She can also add a longer description. |
1018 | |
1019 | - >>> user_browser.getControl('Title').value = 'Aardvark Central Command' |
1020 | >>> user_browser.getControl('Summary').value = ( |
1021 | ... 'Control pesky aardvarkian fnords') |
1022 | >>> user_browser.getControl('Description').value = ( |
1023 | @@ -142,7 +137,6 @@ |
1024 | |
1025 | >>> user_browser.getControl('Name').value = 'kittyhawk' |
1026 | >>> user_browser.getControl('URL').value = 'kittyhawk' |
1027 | - >>> user_browser.getControl('Title').value = 'Kitty Hawk ATC' |
1028 | >>> user_browser.getControl('Summary').value = ( |
1029 | ... 'Kitty Hawk Air Traffic Simulator') |
1030 | >>> user_browser.getControl('Continue').click() |
1031 | @@ -178,7 +172,6 @@ |
1032 | |
1033 | >>> user_browser.getControl('Name').value = 'Snowdog' |
1034 | >>> user_browser.getControl('URL').value = 'snowdog' |
1035 | - >>> user_browser.getControl('Title').value = 'Snowdog Browser' |
1036 | >>> user_browser.getControl('Summary').value = ( |
1037 | ... 'Snowdog is a browser similar to Firefox') |
1038 | >>> user_browser.getControl('Continue').click() |
1039 | |
1040 | === modified file 'lib/lp/registry/stories/product/xx-product-edit.txt' |
1041 | --- lib/lp/registry/stories/product/xx-product-edit.txt 2012-07-06 22:19:56 +0000 |
1042 | +++ lib/lp/registry/stories/product/xx-product-edit.txt 2015-06-27 04:40:18 +0000 |
1043 | @@ -74,7 +74,6 @@ |
1044 | >>> user_browser.open('http://launchpad.dev/products/+new') |
1045 | >>> user_browser.getControl('URL', index=0).value = 'newproductname' |
1046 | >>> user_browser.getControl('Name').value = 'dname' |
1047 | - >>> user_browser.getControl('Title').value = 'title' |
1048 | >>> user_browser.getControl('Summary').value = 'summary' |
1049 | >>> user_browser.getControl('Continue').click() |
1050 | |
1051 | @@ -91,7 +90,6 @@ |
1052 | >>> user_browser.open('http://launchpad.dev/products/+new') |
1053 | >>> user_browser.getControl('URL', index=0).value = 'newproductname2' |
1054 | >>> user_browser.getControl('Name').value = 'dname2' |
1055 | - >>> user_browser.getControl('Title').value = 'title2' |
1056 | >>> user_browser.getControl('Summary').value = 'summary2' |
1057 | >>> user_browser.getControl('Continue').click() |
1058 | |
1059 | |
1060 | === modified file 'lib/lp/registry/stories/project/xx-project-add-product.txt' |
1061 | --- lib/lp/registry/stories/project/xx-project-add-product.txt 2010-04-19 08:11:52 +0000 |
1062 | +++ lib/lp/registry/stories/project/xx-project-add-product.txt 2015-06-27 04:40:18 +0000 |
1063 | @@ -17,7 +17,6 @@ |
1064 | |
1065 | >>> browser.getControl(name='field.displayname').value = 'Eye of GNOME' |
1066 | >>> browser.getControl(name='field.name', index=0).value = 'eog' |
1067 | - >>> browser.getControl(name='field.title').value = 'Eye of GNOME' |
1068 | >>> browser.getControl(name='field.summary').value = 'An image viewer for GNOME' |
1069 | >>> browser.getControl('Continue').click() |
1070 | >>> print browser.url |
1071 | |
1072 | === modified file 'lib/lp/registry/stories/project/xx-project-add.txt' |
1073 | --- lib/lp/registry/stories/project/xx-project-add.txt 2013-09-27 04:13:23 +0000 |
1074 | +++ lib/lp/registry/stories/project/xx-project-add.txt 2015-06-27 04:40:18 +0000 |
1075 | @@ -19,7 +19,6 @@ |
1076 | |
1077 | >>> admin_browser.getControl('Name', index=0).value = 'kde' |
1078 | >>> admin_browser.getControl('Display Name').value = 'K Desktop Environment' |
1079 | - >>> admin_browser.getControl('Title').value = 'K Desktop Environment' |
1080 | >>> admin_browser.getControl('Project Group Summary').value = 'KDE' |
1081 | >>> admin_browser.getControl('Description').value = 'K Desktop Environment' |
1082 | >>> admin_browser.getControl('Maintainer').value = 'cprov' |
1083 | @@ -34,7 +33,6 @@ |
1084 | >>> admin_browser.open('http://launchpad.dev/projectgroups/+new') |
1085 | >>> admin_browser.getControl('Name', index=0).value = 'kde!' |
1086 | >>> admin_browser.getControl('Display Name').value = 'K Desktop Environment' |
1087 | - >>> admin_browser.getControl('Title').value = 'K Desktop Environment' |
1088 | >>> admin_browser.getControl('Project Group Summary').value = 'KDE' |
1089 | >>> admin_browser.getControl('Description').value = 'K Desktop Environment' |
1090 | >>> admin_browser.getControl('Maintainer').value = 'cprov' |
1091 | |
1092 | === modified file 'lib/lp/registry/stories/project/xx-project-edit.txt' |
1093 | --- lib/lp/registry/stories/project/xx-project-edit.txt 2012-04-27 02:41:35 +0000 |
1094 | +++ lib/lp/registry/stories/project/xx-project-edit.txt 2015-06-27 04:40:18 +0000 |
1095 | @@ -11,7 +11,6 @@ |
1096 | |
1097 | >>> soup = find_main_content(browser.contents) |
1098 | >>> browser.getControl('Display Name').value = 'New Name' |
1099 | - >>> browser.getControl('Title').value = 'New Title' |
1100 | >>> browser.getControl('Project Group Summary').value = 'New Summary.' |
1101 | >>> browser.getControl('Description').value = 'New Description.' |
1102 | >>> browser.getControl('Homepage URL').value = 'http://new-url.com/' |
1103 | |
1104 | === modified file 'lib/lp/registry/stories/project/xx-project-index.txt' |
1105 | --- lib/lp/registry/stories/project/xx-project-index.txt 2014-02-19 02:11:16 +0000 |
1106 | +++ lib/lp/registry/stories/project/xx-project-index.txt 2015-06-27 04:40:18 +0000 |
1107 | @@ -69,7 +69,6 @@ |
1108 | >>> admin_browser.open('http://launchpad.dev/projectgroups/+new') |
1109 | >>> admin_browser.getControl(name='field.name').value = 'a-test-group' |
1110 | >>> admin_browser.getControl('Display Name:').value = 'Test Group' |
1111 | - >>> admin_browser.getControl('Title:').value = 'My Test Group' |
1112 | >>> admin_browser.getControl(name='field.summary').value = 'Summary' |
1113 | >>> admin_browser.getControl('Description:').value = 'Define me' |
1114 | >>> admin_browser.getControl('Maintainer:').value = 'cprov' |
1115 | |
1116 | === modified file 'lib/lp/registry/stories/webservice/xx-distribution.txt' |
1117 | --- lib/lp/registry/stories/webservice/xx-distribution.txt 2015-05-13 06:28:34 +0000 |
1118 | +++ lib/lp/registry/stories/webservice/xx-distribution.txt 2015-06-27 04:40:18 +0000 |
1119 | @@ -55,7 +55,7 @@ |
1120 | summary: u'Ubuntu is a new approach to Linux Distribution...' |
1121 | supports_mirrors: True |
1122 | supports_ppas: True |
1123 | - title: u'Ubuntu Linux' |
1124 | + title: u'Ubuntu' |
1125 | vcs: None |
1126 | web_link: u'http://launchpad.../ubuntu' |
1127 | |
1128 | |
1129 | === modified file 'lib/lp/registry/stories/webservice/xx-project-registry.txt' |
1130 | --- lib/lp/registry/stories/webservice/xx-project-registry.txt 2015-06-25 07:39:40 +0000 |
1131 | +++ lib/lp/registry/stories/webservice/xx-project-registry.txt 2015-06-27 04:40:18 +0000 |
1132 | @@ -24,6 +24,7 @@ |
1133 | >>> for project_group in project_group_entries: |
1134 | ... print project_group['display_name'] |
1135 | Apache |
1136 | + ... |
1137 | GNOME |
1138 | ... |
1139 | The Mozilla Project |
1140 | @@ -46,6 +47,7 @@ |
1141 | >>> for project_group in project_group_entries: |
1142 | ... print project_group['display_name'] |
1143 | Apache |
1144 | + ... |
1145 | GNOME |
1146 | ... |
1147 | The Mozilla Project |
1148 | |
1149 | === modified file 'lib/lp/registry/tests/test_product.py' |
1150 | --- lib/lp/registry/tests/test_product.py 2015-06-25 07:39:40 +0000 |
1151 | +++ lib/lp/registry/tests/test_product.py 2015-06-27 04:40:18 +0000 |
1152 | @@ -940,7 +940,7 @@ |
1153 | 'official_codehosting', 'owner', 'private', |
1154 | 'programminglang', 'projectgroup', 'redeemSubscriptionVoucher', |
1155 | 'releaseroot', 'screenshotsurl', 'sourceforgeproject', |
1156 | - 'summary', 'title', 'uses_launchpad', 'wikiurl', 'vcs')), |
1157 | + 'summary', 'uses_launchpad', 'wikiurl', 'vcs')), |
1158 | 'launchpad.Moderate': set(( |
1159 | 'active', 'autoupdate', 'license_approved', 'name', |
1160 | 'project_reviewed', 'registrant', 'reviewer_whiteboard')), |
1161 | |
1162 | === modified file 'lib/lp/soyuz/doc/soyuz-set-of-uploads.txt' |
1163 | --- lib/lp/soyuz/doc/soyuz-set-of-uploads.txt 2015-04-20 09:48:57 +0000 |
1164 | +++ lib/lp/soyuz/doc/soyuz-set-of-uploads.txt 2015-06-27 04:40:18 +0000 |
1165 | @@ -349,7 +349,7 @@ |
1166 | <BLANKLINE> |
1167 | Announcing to breezy-changes@ubuntu.com |
1168 | <BLANKLINE> |
1169 | - Thank you for your contribution to Ubuntu Test. |
1170 | + Thank you for your contribution to ubuntutest. |
1171 | <BLANKLINE> |
1172 | -- = |
1173 | <BLANKLINE> |
1174 | |
1175 | === modified file 'lib/lp/soyuz/stories/distribution/xx-distribution-packages.txt' |
1176 | --- lib/lp/soyuz/stories/distribution/xx-distribution-packages.txt 2014-11-27 22:13:36 +0000 |
1177 | +++ lib/lp/soyuz/stories/distribution/xx-distribution-packages.txt 2015-06-27 04:40:18 +0000 |
1178 | @@ -194,7 +194,7 @@ |
1179 | iceweasel package : Ubuntu |
1180 | |
1181 | >>> print_location(user_browser.contents) |
1182 | - Hierarchy: Ubuntu Linux > iceweasel package |
1183 | + Hierarchy: Ubuntu > iceweasel package |
1184 | Tabs: |
1185 | * Overview (selected) - not linked |
1186 | * Code - http://code.launchpad.dev/ubuntu/+source/iceweasel |
1187 | @@ -391,7 +391,7 @@ |
1188 | Change log : foobar package : Ubuntu |
1189 | |
1190 | >>> print_location(browser.contents) |
1191 | - Hierarchy: Ubuntu Linux > foobar package |
1192 | + Hierarchy: Ubuntu > foobar package |
1193 | Tabs: |
1194 | * Overview (selected) - http://launchpad.dev/ubuntu/+source/foobar |
1195 | * Code - http://code.launchpad.dev/ubuntu/+source/foobar |
1196 | @@ -582,7 +582,7 @@ |
1197 | Publishing history : alsa-utils package : Ubuntu |
1198 | |
1199 | >>> print_location(anon_browser.contents) |
1200 | - Hierarchy: Ubuntu Linux > alsa-utils package |
1201 | + Hierarchy: Ubuntu > alsa-utils package |
1202 | Tabs: |
1203 | * Overview (selected) - http://launchpad.dev/ubuntu/+source/alsa-utils |
1204 | * Code - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
1205 | |
1206 | === modified file 'lib/lp/soyuz/stories/packaging/package-pages-navigation.txt' |
1207 | --- lib/lp/soyuz/stories/packaging/package-pages-navigation.txt 2014-11-29 07:47:46 +0000 |
1208 | +++ lib/lp/soyuz/stories/packaging/package-pages-navigation.txt 2015-06-27 04:40:18 +0000 |
1209 | @@ -16,7 +16,7 @@ |
1210 | |
1211 | >>> anon_browser.open('http://launchpad.dev/ubuntu/+source/alsa-utils') |
1212 | >>> print_location(anon_browser.contents) |
1213 | - Hierarchy: Ubuntu Linux > alsa-utils package |
1214 | + Hierarchy: Ubuntu > alsa-utils package |
1215 | Tabs: |
1216 | * Overview (selected) - not linked |
1217 | * Code - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
1218 | @@ -28,7 +28,7 @@ |
1219 | |
1220 | >>> anon_browser.open('http://bugs.launchpad.dev/ubuntu/+source/alsa-utils') |
1221 | >>> print_location(anon_browser.contents) |
1222 | - Hierarchy: Ubuntu Linux > alsa-utils package |
1223 | + Hierarchy: Ubuntu > alsa-utils package |
1224 | Tabs: |
1225 | * Overview - http://launchpad.dev/ubuntu/+source/alsa-utils |
1226 | * Code - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
1227 | @@ -49,7 +49,7 @@ |
1228 | >>> anon_browser.open( |
1229 | ... 'http://launchpad.dev/ubuntu/+source/alsa-utils/1.0.9a-4ubuntu1') |
1230 | >>> print_location(anon_browser.contents) |
1231 | - Hierarchy: Ubuntu Linux > alsa-utils package |
1232 | + Hierarchy: Ubuntu > alsa-utils package |
1233 | Tabs: |
1234 | * Overview (selected) - http://launchpad.dev/ubuntu/+source/alsa-utils |
1235 | * Code - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
1236 | @@ -68,7 +68,7 @@ |
1237 | >>> anon_browser.open( |
1238 | ... 'http://launchpad.dev/ubuntu/+source/alsa-utils/1.0.9a-4ubuntu1/+build/11') |
1239 | >>> print_location(anon_browser.contents) |
1240 | - Hierarchy: Ubuntu Linux > alsa-utils package > 1.0.9a-4ubuntu1 > i386 build |
1241 | + Hierarchy: Ubuntu > alsa-utils package > 1.0.9a-4ubuntu1 > i386 build |
1242 | Tabs: |
1243 | * Overview (selected) - http://launchpad.dev/ubuntu/+source/alsa-utils |
1244 | * Code - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
1245 | @@ -87,7 +87,7 @@ |
1246 | >>> anon_browser.open( |
1247 | ... 'http://launchpad.dev/ubuntu/hoary/+source/alsa-utils') |
1248 | >>> print_location(anon_browser.contents) |
1249 | - Hierarchy: Ubuntu Linux > alsa-utils package |
1250 | + Hierarchy: Ubuntu > alsa-utils package |
1251 | Tabs: |
1252 | * Overview (selected) - http://launchpad.dev/ubuntu/+source/alsa-utils |
1253 | * Code - http://code.launchpad.dev/ubuntu/+source/alsa-utils |
1254 | @@ -105,7 +105,7 @@ |
1255 | |
1256 | >>> anon_browser.open('http://launchpad.dev/ubuntu/hoary/i386') |
1257 | >>> print_location(anon_browser.contents) |
1258 | - Hierarchy: Ubuntu Linux > Hoary (5.04) > i386 |
1259 | + Hierarchy: Ubuntu > Hoary (5.04) > i386 |
1260 | Tabs: |
1261 | * Overview (selected) - http://launchpad.dev/ubuntu |
1262 | * Code - http://code.launchpad.dev/ubuntu |
1263 | @@ -123,7 +123,7 @@ |
1264 | |
1265 | >>> anon_browser.open('http://launchpad.dev/ubuntu/hoary/i386/pmount') |
1266 | >>> print_location(anon_browser.contents) |
1267 | - Hierarchy: Ubuntu Linux > Hoary (5.04) > i386 > pmount |
1268 | + Hierarchy: Ubuntu > Hoary (5.04) > i386 > pmount |
1269 | Tabs: |
1270 | * Overview (selected) - http://launchpad.dev/ubuntu |
1271 | * Code - http://code.launchpad.dev/ubuntu |
1272 | @@ -142,7 +142,7 @@ |
1273 | >>> anon_browser.open( |
1274 | ... 'http://launchpad.dev/ubuntu/hoary/i386/pmount/0.1-1') |
1275 | >>> print_location(anon_browser.contents) |
1276 | - Hierarchy: Ubuntu Linux > Hoary (5.04) > i386 > pmount > 0.1-1 |
1277 | + Hierarchy: Ubuntu > Hoary (5.04) > i386 > pmount > 0.1-1 |
1278 | Tabs: |
1279 | * Overview (selected) - http://launchpad.dev/ubuntu |
1280 | * Code - http://code.launchpad.dev/ubuntu |
1281 | |
1282 | === modified file 'lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt' |
1283 | --- lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt 2015-06-24 00:17:11 +0000 |
1284 | +++ lib/lp/soyuz/stories/ppa/xx-ubuntu-ppas.txt 2015-06-27 04:40:18 +0000 |
1285 | @@ -1,11 +1,11 @@ |
1286 | = Ubuntu PPAs = |
1287 | |
1288 | -The Ubuntu Linux page contains a link to get to the Personal Package Archives. |
1289 | +The Ubuntu page contains a link to get to the Personal Package Archives. |
1290 | |
1291 | >>> anon_browser.open("http://launchpad.dev/ubuntu") |
1292 | >>> anon_browser.getLink("Personal Package Archives").click() |
1293 | >>> print_location(anon_browser.contents) |
1294 | - Hierarchy: Ubuntu Linux |
1295 | + Hierarchy: Ubuntu |
1296 | Tabs: |
1297 | * Overview (selected) - http://launchpad.dev/ubuntu |
1298 | * Code - http://code.launchpad.dev/ubuntu |
1299 | @@ -13,7 +13,7 @@ |
1300 | * Blueprints - http://blueprints.launchpad.dev/ubuntu |
1301 | * Translations - http://translations.launchpad.dev/ubuntu |
1302 | * Answers - http://answers.launchpad.dev/ubuntu |
1303 | - Main heading: Personal Package Archives for Ubuntu Linux |
1304 | + Main heading: Personal Package Archives for Ubuntu |
1305 | |
1306 | |
1307 | == Distribution PPA main page == |
1308 | |
1309 | === modified file 'lib/lp/soyuz/stories/soyuz/xx-distribution-add.txt' |
1310 | --- lib/lp/soyuz/stories/soyuz/xx-distribution-add.txt 2012-12-18 02:24:43 +0000 |
1311 | +++ lib/lp/soyuz/stories/soyuz/xx-distribution-add.txt 2015-06-27 04:40:18 +0000 |
1312 | @@ -30,7 +30,6 @@ |
1313 | |
1314 | >>> admin_browser.getControl(name="field.name").value = 'test' |
1315 | >>> admin_browser.getControl("Display Name").value = 'Test Distro' |
1316 | - >>> admin_browser.getControl("Title").value = 'The Test Distribution' |
1317 | >>> admin_browser.getControl("Summary").value = 'Test Distro Summary' |
1318 | >>> admin_browser.getControl("Description").value = 'Test Distro Description' |
1319 | >>> admin_browser.getControl("Web site URL").value = 'foo.com' |
1320 | @@ -41,5 +40,5 @@ |
1321 | 'http://launchpad.dev/test' |
1322 | |
1323 | >>> admin_browser.contents |
1324 | - '...The Test Distribution...' |
1325 | + '...Test Distro...' |
1326 | |
1327 | |
1328 | === modified file 'lib/lp/soyuz/stories/soyuz/xx-distribution-archives.txt' |
1329 | --- lib/lp/soyuz/stories/soyuz/xx-distribution-archives.txt 2014-11-27 07:48:25 +0000 |
1330 | +++ lib/lp/soyuz/stories/soyuz/xx-distribution-archives.txt 2015-06-27 04:40:18 +0000 |
1331 | @@ -52,14 +52,14 @@ |
1332 | |
1333 | >>> anon_browser.open("http://launchpad.dev/ubuntu/+archives") |
1334 | >>> print anon_browser.title |
1335 | - Ubuntu Linux Copy Archives... |
1336 | + Ubuntu Copy Archives... |
1337 | |
1338 | This index of /ubuntu/+archives provides an overview describing |
1339 | what the viewer can expect to find here |
1340 | |
1341 | >>> main_content = find_main_content(anon_browser.contents) |
1342 | >>> print extract_text(main_content) |
1343 | - Copy Archives related to Ubuntu Linux |
1344 | + Copy Archives related to Ubuntu |
1345 | 'Copy' archives containing packages copied from other archives |
1346 | (the main archive or PPAs) for a distribution. |
1347 | ... |
1348 | |
1349 | === modified file 'lib/lp/soyuz/stories/soyuz/xx-distribution-edit.txt' |
1350 | --- lib/lp/soyuz/stories/soyuz/xx-distribution-edit.txt 2009-08-23 05:28:49 +0000 |
1351 | +++ lib/lp/soyuz/stories/soyuz/xx-distribution-edit.txt 2015-06-27 04:40:18 +0000 |
1352 | @@ -11,7 +11,6 @@ |
1353 | 'Ubuntu' |
1354 | >>> admin_browser.getControl("Display Name").value = 'Test Distro' |
1355 | |
1356 | - >>> admin_browser.getControl("Title").value = 'The Test Distribution' |
1357 | >>> admin_browser.getControl("Summary").value = 'Test Distro Summary' |
1358 | >>> admin_browser.getControl("Description").value = 'Test Distro Description' |
1359 | |
1360 | |
1361 | === modified file 'lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt' |
1362 | --- lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt 2014-11-27 22:13:36 +0000 |
1363 | +++ lib/lp/soyuz/stories/soyuz/xx-distributionsourcepackagerelease-pages.txt 2015-06-27 04:40:18 +0000 |
1364 | @@ -45,7 +45,7 @@ |
1365 | they all point to the `DistributionSourcePackage` (parent) url. |
1366 | |
1367 | >>> print_location(anon_browser.contents) |
1368 | - Hierarchy: Ubuntu Test > testing-dspr package |
1369 | + Hierarchy: ubuntutest > testing-dspr package |
1370 | Tabs: |
1371 | * Overview (selected) - http://launchpad.dev/ubuntutest/+source/testing-dspr |
1372 | * Code - http://code.launchpad.dev/ubuntutest/+source/testing-dspr |
1373 | |
1374 | === modified file 'lib/lp/soyuz/stories/soyuz/xx-distro-distros-index.txt' |
1375 | --- lib/lp/soyuz/stories/soyuz/xx-distro-distros-index.txt 2009-06-12 16:36:02 +0000 |
1376 | +++ lib/lp/soyuz/stories/soyuz/xx-distro-distros-index.txt 2015-06-27 04:40:18 +0000 |
1377 | @@ -5,9 +5,9 @@ |
1378 | >>> browser.contents |
1379 | '...Distributions...' |
1380 | |
1381 | - >>> browser.getLink("Kubuntu - Free KDE-based Linux").click() |
1382 | + >>> browser.getLink("Kubuntu").click() |
1383 | >>> browser.url |
1384 | 'http://localhost/kubuntu' |
1385 | >>> browser.contents |
1386 | - '...Free KDE-based Linux...' |
1387 | + '...Kubuntu...' |
1388 | |
1389 | |
1390 | === modified file 'lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt' |
1391 | --- lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt 2014-11-27 22:13:36 +0000 |
1392 | +++ lib/lp/soyuz/stories/soyuz/xx-sourcepackage-changelog.txt 2015-06-27 04:40:18 +0000 |
1393 | @@ -6,7 +6,7 @@ |
1394 | >>> user_browser.open( |
1395 | ... "http://launchpad.dev/ubuntu/hoary/+source/pmount/+changelog") |
1396 | >>> print_location(user_browser.contents) |
1397 | - Hierarchy: Ubuntu Linux > ...pmount... package > Hoary (5.04) > Change log |
1398 | + Hierarchy: Ubuntu > ...pmount... package > Hoary (5.04) > Change log |
1399 | Tabs: |
1400 | * Overview (selected) - http://launchpad.dev/ubuntu/+source/pmount |
1401 | * Code - http://code.launchpad.dev/ubuntu/+source/pmount |
1402 | |
1403 | === modified file 'lib/lp/translations/stories/standalone/xx-products-with-translations.txt' |
1404 | --- lib/lp/translations/stories/standalone/xx-products-with-translations.txt 2010-11-24 14:44:39 +0000 |
1405 | +++ lib/lp/translations/stories/standalone/xx-products-with-translations.txt 2015-06-27 04:40:18 +0000 |
1406 | @@ -27,6 +27,6 @@ |
1407 | >>> print find_main_content(browser.contents).renderContents() |
1408 | <...> |
1409 | ... of 2 results |
1410 | + ...Evolution... |
1411 | ...alsa-utils... |
1412 | - ...Evolution... |
1413 |