Merge lp:~bac/launchpad/bug-671539 into lp:launchpad

[Brad Crittenden]

Don't show 'registered branches' on a team's code page.

= Summary =

Don't show the number of branches registered by teams as it is nonsense.

== Proposed fix ==

Make the link disabled if the person is a team and make the template be
conditional based on the enabled property.

Also removed some extraneous conditions in the page template. Note at
the top 'menu' is used in a condition so it cannot be unset in the body
of the template.

Also changed the class on the <td>s for consistency of count alignment.

== Pre-implementation notes ==

None

== Implementation details ==

As above.

== Tests ==

bin/test -vvm lp.code xx-person-branches.txt

== Demo and Q/A ==

Look at https://launchpad.dev/~landscape-developers and
http://launchpad.net/~launchpad to see that the line is not displayed.

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/code/stories/branches/xx-person-branches.txt
  lib/lp/code/templates/person-codesummary.pt
  lib/lp/code/browser/branchlisting.py

[Jeroen T. Vermeulen (jtv)]

Nice change. The only note I had for the code was that instead of saying

if not person.is_team:
    enabled = True
else:
    enabled = False

...(..., enabled=enabled)

it would probably be clearer to say

owner_is_individual = (not person.is_team)
...(..., enabled=owner_is_individual)

I'm not entirely sure the underlining of that section of the story test should be "=" as opposed to "-," but since I don't like rest-style headings at all I'm probably talking nonsense.

Anyway: Approved, and keep 'em coming. :-)

Jeroen

review: Approve (code)

=== modified file 'lib/lp/code/browser/branchlisting.py'
--- lib/lp/code/browser/branchlisting.py	2010-10-27 08:51:05 +0000
+++ lib/lp/code/browser/branchlisting.py	2010-11-08 10:46:12 +0000
@@ -914,11 +914,13 @@
                 self.owned_branch_count, 'owned branch', 'owned branches'))
 
     def registered(self):
+        person_is_individual = (not self.person.is_team)
         return Link(
             '+registeredbranches',
             get_plural_text(
                 self.registered_branch_count,
-                'registered branch', 'registered branches'))
+                'registered branch', 'registered branches'),
+            enabled=person_is_individual)
 
     def subscribed(self):
         return Link(

=== modified file 'lib/lp/code/stories/branches/xx-person-branches.txt'
--- lib/lp/code/stories/branches/xx-person-branches.txt	2010-10-18 20:59:08 +0000
+++ lib/lp/code/stories/branches/xx-person-branches.txt	2010-11-08 10:46:12 +0000
@@ -1,4 +1,3 @@
-============================
 Person Views of Branch Lists
 ============================
 
@@ -19,7 +18,7 @@
 
 
 Default view for a person on code root site
-===========================================
+-------------------------------------------
 
 The default view for a person on the code root site is the normal branch
 listing view for that person.
@@ -34,7 +33,7 @@
 
 
 Junk branches
-=============
+-------------
 
 On the user's own code page, they will see directions on pushing a branch.
 
@@ -47,7 +46,7 @@
 
 
 Owned Branches
-==============
+--------------
 
 A person's owned branches are shown on their code application overview page.
 
@@ -60,7 +59,7 @@
 
 
 Registered Branches
-===================
+-------------------
 
 There is also a link which points to the registered branches page.
 
@@ -76,7 +75,7 @@
 
 
 Subscribed branches
-===================
+-------------------
 
 From the persons main listing page, there is also a link to subscribed
 branches.
@@ -93,7 +92,7 @@
 
 
 Person branch summary
-=====================
+---------------------
 
 Each of the person branch listing pages has a brief summary at the
 top of the page with some branch counts.  These also contain the links
@@ -132,3 +131,21 @@
     2 registered branches
     1 subscribed branch
     0 active reviews
+
+
+Teams do not show registered branches
+-------------------------------------
+
+For a team, showing registered branches does not make sense, so that
+line is omitted.
+
+    >>> browser.open('http://code.launchpad.dev/~landscape-developers')
+    >>> print_tag_with_id(
+    ...     browser.contents, 'portlet-person-codesummary')
+    1 owned branch
+    2 subscribed branches
+    0 active reviews
+
+    >>> browser.getLink('registered').click()
+    Traceback (most recent call last):
+    LinkNotFoundError

=== modified file 'lib/lp/code/templates/person-codesummary.pt'
--- lib/lp/code/templates/person-codesummary.pt	2010-10-15 01:48:05 +0000
+++ lib/lp/code/templates/person-codesummary.pt	2010-11-08 10:46:12 +0000
@@ -10,27 +10,21 @@
   <table>
     <tr class="code-links">
       <td class="code-count" tal:content="menu/owned_branch_count">100</td>
-      <td tal:condition="menu"
-          tal:content="structure menu/owned/render"
+      <td tal:content="structure menu/owned/render"
           />
     </tr>
-    <tr>
+    <tr class="code-links"
+        tal:condition="menu/registered/enabled">
       <td class="code-count" tal:content="menu/registered_branch_count">100</td>
-      <td tal:condition="menu"
-          tal:content="structure menu/registered/render"
-          />
+      <td tal:content="structure menu/registered/render" />
     </tr>
-    <tr>
+    <tr class="code-links">
       <td class="code-count" tal:content="menu/subscribed_branch_count">100</td>
-      <td tal:condition="menu"
-          tal:content="structure menu/subscribed/render"
-          />
+      <td tal:content="structure menu/subscribed/render" />
     </tr>
-    <tr id="merge-counts">
+    <tr class="code-links" id="merge-counts">
       <td class="code-count" tal:content="menu/active_review_count">5</td>
-      <td tal:condition="menu"
-          tal:content="structure menu/active_reviews/render"
-          />
+      <td tal:content="structure menu/active_reviews/render" />
     </tr>
   </table>
 </div>