Launchpad itself

Merge lp://qastaging/~thumper/launchpad/bmp-registration-slot into lp://qastaging/launchpad

  1. bmp-registration-slot
  2. Merge into devel
Proposed by Tim Penhey
Status: Merged
Approved by: Michael Hudson-Doyle
Approved revision: no longer in the source branch.
Merged at revision: not available
Proposed branch: lp://qastaging/~thumper/launchpad/bmp-registration-slot
Merge into: lp://qastaging/launchpad
Diff against target: 46 lines
3 files modified
lib/lp/code/stories/branches/xx-branch-merge-proposals.txt (+0/-1)
lib/lp/code/templates/branchmergeproposal-index.pt (+6/-0)
lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt (+0/-7)
To merge this branch: bzr merge lp://qastaging/~thumper/launchpad/bmp-registration-slot
Reviewer Review Type Date Requested Status
Michael Hudson-Doyle Approve
Review via email: mp+13683@code.qastaging.launchpad.net

Commit message

Move the proposal registrant into the registrant slot.

To post a comment you must log in.
Revision history for this message
Tim Penhey (thumper) wrote :

Moves the proposal of the merge proposal into the registrant slot.

Revision history for this message
Michael Hudson-Doyle (mwhudson) wrote :

Fine.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/code/stories/branches/xx-branch-merge-proposals.txt'
2--- lib/lp/code/stories/branches/xx-branch-merge-proposals.txt 2009-10-21 13:51:46 +0000
3+++ lib/lp/code/stories/branches/xx-branch-merge-proposals.txt 2009-10-21 23:21:17 +0000
4@@ -284,7 +284,6 @@
5 The proposal's merged revision has been updated.
6 >>> print_summary(sample_browser)
7 Status: Merged
8- ...
9 Merged at revision: 42
10 ...
11 >>> sample_browser.getLink('~name12/gnome-terminal/klingon').click()
12
13=== modified file 'lib/lp/code/templates/branchmergeproposal-index.pt'
14--- lib/lp/code/templates/branchmergeproposal-index.pt 2009-10-13 15:56:13 +0000
15+++ lib/lp/code/templates/branchmergeproposal-index.pt 2009-10-21 23:21:17 +0000
16@@ -30,6 +30,12 @@
17 </script>
18 </metal:block>
19
20+<tal:registering metal:fill-slot="registering">
21+ Proposed by
22+ <tal:registrant replace="structure context/registrant/fmt:link"/>
23+ <tal:modified replace="context/date_created/fmt:displaydate" />
24+</tal:registering>
25+
26
27 <metal:side fill-slot="side"
28 tal:define="context_menu context/menu:context">
29
30=== modified file 'lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt'
31--- lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt 2009-10-21 13:51:46 +0000
32+++ lib/lp/code/templates/branchmergeproposal-pagelet-summary.pt 2009-10-21 23:21:17 +0000
33@@ -20,13 +20,6 @@
34 </a>
35 </td>
36 </tr>
37- <tr>
38- <th>Proposed by:</th>
39- <td>
40- <tal:registrant replace="structure context/registrant/fmt:link"/>
41- <tal:modified replace="context/date_created/fmt:displaydate" />
42- </td>
43- </tr>
44 <tal:comment condition="nothing">
45 Only show the reviewed section if the state is not superseded.
46 Only show the reviewed revision if not rejected.