Launchpad itself

Merge lp:~rvb/launchpad/derivation-ui-fixes into lp:launchpad/db-devel

  1. derivation-ui-fixes
  2. Merge into db-devel
Proposed by Raphaël Badin
Status: Merged
Approved by: Julian Edwards
Approved revision: no longer in the source branch.
Merged at revision: 10575
Proposed branch: lp:~rvb/launchpad/derivation-ui-fixes
Merge into: lp:launchpad/db-devel
Diff against target: 83 lines (+10/-19)
2 files modified
lib/lp/registry/browser/distroseries.py (+0/-15)
lib/lp/registry/templates/distroseries-localdifferences.pt (+10/-4)
To merge this branch: bzr merge lp:~rvb/launchpad/derivation-ui-fixes
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+61721@code.launchpad.net

Commit message

[r=julian-edwards][bug=783429,783433,783436,783441] Minor UI fixes for derived distros.

Description of the change

Minor UI fixes for derived distros.

To post a comment you must log in.
Revision history for this message
Julian Edwards (julian-edwards) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/registry/browser/distroseries.py'
2--- lib/lp/registry/browser/distroseries.py 2011-05-19 16:05:17 +0000
3+++ lib/lp/registry/browser/distroseries.py 2011-05-20 09:43:33 +0000
4@@ -989,11 +989,6 @@
5 self.getParentName(multiple_parent_default='parent series'),
6 ))
7
8- @action(_("Update"), name="update")
9- def update_action(self, action, data):
10- """Simply re-issue the form with the new values."""
11- pass
12-
13 @action(_("Sync Sources"), name="sync", validator='validate_sync',
14 condition='canPerformSync')
15 def sync_sources(self, action, data):
16@@ -1089,11 +1084,6 @@
17 self.context.displayname,
18 ))
19
20- @action(_("Update"), name="update")
21- def update_action(self, action, data):
22- """Simply re-issue the form with the new values."""
23- pass
24-
25 @action(_("Sync Sources"), name="sync", validator='validate_sync',
26 condition='canPerformSync')
27 def sync_sources(self, action, data):
28@@ -1130,10 +1120,5 @@
29 self.getParentName(),
30 ))
31
32- @action(_("Update"), name="update")
33- def update_action(self, action, data):
34- """Simply re-issue the form with the new values."""
35- pass
36-
37 def canPerformSync(self, *args):
38 return False
39
40=== modified file 'lib/lp/registry/templates/distroseries-localdifferences.pt'
41--- lib/lp/registry/templates/distroseries-localdifferences.pt 2011-05-19 17:06:13 +0000
42+++ lib/lp/registry/templates/distroseries-localdifferences.pt 2011-05-20 09:43:33 +0000
43@@ -47,14 +47,17 @@
44 </th>
45 <th tal:condition="view/show_parent_version">
46 <tal:one_parent condition="view/has_unique_parent">
47- <tal:replace replace="view/unique_parent/displayname" /> version
48+ <a tal:attributes="href view/unique_parent/fmt:url"
49+ tal:content="view/unique_parent/displayname">Warty</a> version
50 </tal:one_parent>
51 <tal:multiple_parents condition="not: view/has_unique_parent">
52 Parent version
53 </tal:multiple_parents>
54 </th>
55 <th tal:condition="view/show_derived_version">
56- <tal:replace replace="series_name" /> version</th>
57+ <a tal:attributes="href context/fmt:url"
58+ tal:content="series_name">Deriwarty</a> version
59+ </th>
60 <th tal:condition="view/show_parent_packagesets">
61 Parent package-sets
62 </th>
63@@ -81,7 +84,8 @@
64 value diff_id;
65 id string:field.selected_differences.${diff_id}"/>
66
67- <a tal:attributes="href difference/fmt:url" class="toggle-extra"
68+ <a tal:attributes="href difference/fmt:url"
69+ class="js-action toggle-extra"
70 tal:content="src_name">Foo</a>
71 </tal:checkbox>
72 <tal:clockface condition="python: view.hasPendingSync(difference)">
73@@ -176,7 +180,9 @@
74 </tal:difference>
75 </tbody>
76 </table>
77- <tal:selectable_differences_end
78+ <tal:navigation_bottom
79+ replace="structure differences/@@+navigation-links-lower" />
80+ <tal:selectable_differences_end
81 define="widget nocall:view/widgets/selected_differences;
82 field_name widget/context/__name__;
83 error python:view.getFieldError(field_name);">

Subscribers

People subscribed via source and target branches

to status/vote changes: