launchpad-reviewers team mailing list archive

[William Grant <me@xxxxxxxxxxxxxxxxxx>]

William Grant has proposed merging lp:~wgrant/launchpad/bug-727445 into lp:launchpad.

Commit message:
Fix the message on the team homepage when the user is the owner but only an indirect member.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #727445 in Launchpad itself: "team page says "You are not currently an active member" even though I am"
  https://bugs.launchpad.net/launchpad/+bug/727445

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/bug-727445/+merge/208377

Fix the message on the team homepage when the user is the owner but only an indirect member. It was checking for direct membership rather than participation.

The actual fix is a one-liner, but I added tests and reworded the text to be more direct.
-- 
https://code.launchpad.net/~wgrant/launchpad/bug-727445/+merge/208377
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/bug-727445 into lp:launchpad.

=== modified file 'lib/lp/registry/stories/team/xx-team-home.txt'
--- lib/lp/registry/stories/team/xx-team-home.txt	2012-08-13 20:07:00 +0000
+++ lib/lp/registry/stories/team/xx-team-home.txt	2014-02-26 14:09:48 +0000
@@ -121,13 +121,21 @@
     >>> browser.open('http://launchpad.dev/~guadamen')
     >>> print extract_text(
     ...     find_tag_by_id(browser.contents, 'your-involvement'))
-    You are the owner of this team...
-
-    >>> browser.open('http://launchpad.dev/~rosetta-admins')
-    >>> print extract_text(
-    ...     find_tag_by_id(browser.contents, 'your-involvement'))
-    You are a member of the team that owns this team.
-    You are not currently an active member...
+    You own this team...
+
+    >>> browser.open('http://launchpad.dev/~rosetta-admins')
+    >>> print extract_text(
+    ...     find_tag_by_id(browser.contents, 'your-involvement'))
+    You indirectly own this team.
+    You are not currently a member...
+
+    >>> browser.getLink('Add member').click()
+    >>> browser.getControl('New member').value = 'admins'
+    >>> browser.getControl('Add Member').click()
+    >>> browser.open('http://launchpad.dev/~rosetta-admins')
+    >>> print extract_text(
+    ...     find_tag_by_id(browser.contents, 'your-involvement'))
+    You indirectly own this team.
 
     >>> browser.open('http://launchpad.dev/~ubuntu-team')
     >>> print extract_text(

=== modified file 'lib/lp/registry/stories/teammembership/xx-team-leave.txt'
--- lib/lp/registry/stories/teammembership/xx-team-leave.txt	2012-04-19 10:49:54 +0000
+++ lib/lp/registry/stories/teammembership/xx-team-leave.txt	2014-02-26 14:09:48 +0000
@@ -81,7 +81,7 @@
     >>> browser.open('http://launchpad.dev/~testing-spanish-team')
     >>> print extract_text(
     ...     find_tag_by_id(browser.contents, 'your-involvement'))
-    You are the owner of this team...
+    You own this team...
     >>> browser.getLink('Leave the Team')
     Traceback (most recent call last):
     ...

=== modified file 'lib/lp/registry/templates/team-portlet-membership.pt'
--- lib/lp/registry/templates/team-portlet-membership.pt	2012-07-10 05:32:17 +0000
+++ lib/lp/registry/templates/team-portlet-membership.pt	2014-02-26 14:09:48 +0000
@@ -55,13 +55,13 @@
     <div id="your-involvement" tal:condition="request/lp:person">
       <tal:is-owner condition="view/userIsOwner">
           <tal:team condition="context/teamowner/is_team">
-            You are a member of the team that owns this team.
+            You indirectly own this team.
           </tal:team>
           <tal:user condition="not: context/teamowner/is_team">
-            You are the owner of this team.
+            You own this team.
           </tal:user>
-          <tal:absentee-owner condition="not: view/user_is_active_member">
-            You are not currently an active member.
+          <tal:absentee-owner condition="not: view/userIsParticipant">
+            You are not currently a member.
           </tal:absentee-owner>
       </tal:is-owner>