Launchpad itself

Merge lp:~ivo-kracht/launchpad/bug-824292 into lp:launchpad

  1. bug-824292
  2. Merge into devel
Proposed by Ivo Kracht on 2012-06-27
Status: Merged
Approved by: Abel Deuring on 2012-06-28
Approved revision: no longer in the source branch.
Merged at revision: 15517
Proposed branch: lp:~ivo-kracht/launchpad/bug-824292
Merge into: lp:launchpad
Diff against target: 39 lines (+2/-7)
3 files modified
lib/lp/soyuz/stories/soyuz/xx-queue-pages-motu.txt (+1/-1)
lib/lp/soyuz/stories/soyuz/xx-queue-pages.txt (+1/-1)
lib/lp/soyuz/templates/distroseries-portlet-latestuploads.pt (+0/-5)
To merge this branch: bzr merge lp:~ivo-kracht/launchpad/bug-824292
Reviewer Review Type Date Requested Status
Raphaël Badin (community) 2012-06-27 Approve on 2012-06-27
Francesco Banconi (community) code* 2012-06-27 Approve on 2012-06-27
Review via email: mp+112352@code.launchpad.net

Commit Message

Only one "show uploads" link on distro series pages

Description of the Change

Deleted some lines in the template that implement the link. No tests check it so I didn't have to change anything.

Pre-imp call with adeuring

test:
./bin/test soyuz -vvt xx-distroseries-index.txt

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/soyuz/templates/distroseries-portlet-latestuploads.pt

To post a comment you must log in.
Francesco Banconi (frankban) wrote :

Looks good Ivo, thanks for deleting a duplicated link.

review: Approve (code*)
Raphaël Badin (rvb) wrote :

Looks good.

[0]

I think you forgot to attach the related bug to that MP.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/soyuz/stories/soyuz/xx-queue-pages-motu.txt'
2--- lib/lp/soyuz/stories/soyuz/xx-queue-pages-motu.txt 2011-12-30 06:14:56 +0000
3+++ lib/lp/soyuz/stories/soyuz/xx-queue-pages-motu.txt 2012-06-28 12:59:59 +0000
4@@ -38,7 +38,7 @@
5
6 >>> motu_browser.open(
7 ... "http://launchpad.dev/ubuntu/breezy-autotest/")
8- >>> motu_browser.getLink("Show uploads").click()
9+ >>> motu_browser.getLink("All uploads").click()
10 >>> print_queue(motu_browser.contents)
11 Package Version Component Section Priority Sets Pocket When
12 netapplet...ddtp... - Release 2006...
13
14=== modified file 'lib/lp/soyuz/stories/soyuz/xx-queue-pages.txt'
15--- lib/lp/soyuz/stories/soyuz/xx-queue-pages.txt 2012-01-06 11:08:30 +0000
16+++ lib/lp/soyuz/stories/soyuz/xx-queue-pages.txt 2012-06-28 12:59:59 +0000
17@@ -56,7 +56,7 @@
18
19 >>> anon_browser.open(
20 ... "http://launchpad.dev/ubuntu/breezy-autotest/")
21- >>> anon_browser.getLink("Show uploads").click()
22+ >>> anon_browser.getLink("All uploads").click()
23
24 >>> anon_browser.getControl(
25 ... name="queue_state", index=0).displayValue
26
27=== modified file 'lib/lp/soyuz/templates/distroseries-portlet-latestuploads.pt'
28--- lib/lp/soyuz/templates/distroseries-portlet-latestuploads.pt 2012-06-11 00:03:25 +0000
29+++ lib/lp/soyuz/templates/distroseries-portlet-latestuploads.pt 2012-06-28 12:59:59 +0000
30@@ -28,9 +28,4 @@
31 There are no recent source package uploads.
32 </p>
33
34- <ul class="horizontal">
35- <li>
36- <a tal:replace="structure context/menu:overview/queue/fmt:link" />
37- </li>
38- </ul>
39 </div>