Merge lp:~cjwatson/launchpad/remove-empty-portlet into lp:launchpad

Proposed by Colin Watson on 2015-11-02
Status: Merged
Merged at revision: 17840
Proposed branch: lp:~cjwatson/launchpad/remove-empty-portlet
Merge into: lp:launchpad
Diff against target: 40 lines (+0/-12)
2 files modified
lib/lp/code/browser/branchlisting.py (+0/-7)
lib/lp/code/templates/person-branches.pt (+0/-5)
To merge this branch: bzr merge lp:~cjwatson/launchpad/remove-empty-portlet
Reviewer Review Type Date Requested Status
William Grant code 2015-11-02 Approve on 2015-11-04
Review via email: mp+276393@code.launchpad.net

Commit message

Remove always-empty portlet from Person:+branches.

Description of the change

Remove always-empty portlet from Person:+branches. Its content was removed in r14929.

To post a comment you must log in.
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/code/browser/branchlisting.py'
2--- lib/lp/code/browser/branchlisting.py 2015-09-23 17:51:12 +0000
3+++ lib/lp/code/browser/branchlisting.py 2015-11-02 14:07:20 +0000
4@@ -918,12 +918,6 @@
5 return self.context
6
7 @property
8- def show_action_menu(self):
9- if self.user is not None:
10- return self.user.inTeam(self.context)
11- return False
12-
13- @property
14 def show_junk_directions(self):
15 return self.user == self.context
16
17@@ -976,7 +970,6 @@
18 no_sort_by = (
19 BranchListingSort.DEFAULT, BranchListingSort.OWNER,
20 BranchListingSort.PRODUCT)
21- show_action_menu = False
22
23 @property
24 def person(self):
25
26=== modified file 'lib/lp/code/templates/person-branches.pt'
27--- lib/lp/code/templates/person-branches.pt 2015-06-04 08:50:04 +0000
28+++ lib/lp/code/templates/person-branches.pt 2015-11-02 14:07:20 +0000
29@@ -10,11 +10,6 @@
30
31 <metal:side fill-slot="side">
32
33- <div tal:define="menu context/menu:branches"
34- tal:condition="view/show_action_menu"
35- class="first portlet">
36- </div>
37-
38 <tal:summary replace="structure context/@@+codesummary"/>
39
40 </metal:side>