Merge lp:~sinzui/launchpad/unactivated-profile-0 into lp:launchpad

[Curtis Hovey]

This is my branch to hide email addresses on unactivated profile page.

    lp:~sinzui/launchpad/unactivated-profile-0
    Diff size: 98
    Launchpad bug:
          https://bugs.launchpad.net/bugs/595983
    Test command: ./bin/test -vv \
          -t xx-person-home.txt
    Pre-implementation: edwin, bac
    Target release: 10.06

Hide email addresses on unactivated profile page
-------------------------------------------------

https://launchpad.net/~simmo shows an email address to anonymous users. No
email address should be visible.

This was caused by the separation of SSO from Lp. The address was activated
via ubuntu's SSO. The fix is to remove the email address block from the
section that shows non-active profiles.

Rules
-----

Why is there no story for what can be seen or done with an unclaimed profile?
Annotate implies the email address is there for Admins, but the permission
is not Admin.

    * Add a story that explains what any user can see about an unclaimed
      profile.
    * Add a story that explains admins can see email address that belong
      to profiles that have been activated via SSO.
    * Update the template to restrict the email address to launchpad.Admin
    * Remove the redundant block to edit the email address...it is already
      next to the email address.

QA
--

    * Visit https://launchpad.net/~simmo
    * Verify his email address is not visible.

Lint
----

Linting changed files:
  lib/lp/registry/stories/person/xx-person-home.txt
  lib/lp/registry/templates/person-index.pt

Test
----

    * lib/lp/registry/stories/person/xx-person-home.txt
      * Add a story that explains what any user can see about an unclaimed
        profile.
      * Add a story that explains admins can see email address that belong
        to profiles that have been activated via SSO.

Implementation
--------------

    * lib/lp/registry/templates/person-index.pt
      * Change the permission to launchpad.Admin and move it to the start
        of the email block
      * Removed the redundant paragraph for editing the email address.
      * Fixed the indentation of claim team.

[Brad Crittenden (bac)]

Curtis,

Thanks for the quick turn-around on this bug and for the nice test coverage.

Please s/launchpad/Launchpad in your test narrative.

Also, you demonstrate that an anonymous user cannot see the email address but that an admin can. I think it is important to show what a regular user sees (or doesn't).

review: Approve (code)

[Curtis Hovey (sinzui)]

On Fri, 2010-06-18 at 18:15 +0000, Brad Crittenden wrote:
> Review: Approve code
> Curtis,
>
> Thanks for the quick turn-around on this bug and for the nice test coverage.
>
> Please s/launchpad/Launchpad in your test narrative.
>
> Also, you demonstrate that an anonymous user cannot see the email
> address but that an admin can. I think it is important to show what a
> regular user sees (or doesn't).

Easily done.

    >>> user_browser.open('https://launchpad.dev/~jvprat')
    >>> print find_tag_by_id(user_browser.contents, 'email-addresses')
    None

Test passed as I expected. If the template permissions are lost, this
will fail.

--
__Curtis C. Hovey_________
http://launchpad.net/

=== modified file 'lib/lp/registry/stories/person/xx-person-home.txt'
--- lib/lp/registry/stories/person/xx-person-home.txt	2010-06-11 21:54:08 +0000
+++ lib/lp/registry/stories/person/xx-person-home.txt	2010-06-18 23:27:31 +0000
@@ -232,3 +232,50 @@
     >>> anon_browser.open('http://launchpad.dev/~ubuntu-team')
     >>> print find_tag_by_id(anon_browser.contents, 'contributions')
     None
+
+
+Unactivated profiles
+--------------------
+
+Many profiles are created for users who contributed to projects that were
+imported into Launchpad. Any user can see an unclaimed profile and a link
+to request a claim the profile.
+
+    >>> anon_browser.open('https://launchpad.dev/~jvprat')
+    >>> print anon_browser.title
+    Jordi Vilalta does not use Launchpad
+
+    >>> print extract_text(find_main_content(anon_browser.contents))
+    Jordi Vilalta does not use Launchpad. This page was created on ...
+    when importing the Catalan (ca) translation of pmount in Ubuntu Hoary...
+
+    >>> anon_browser.getLink('Are you Jordi Vilalta')
+    <Link text='Are you Jordi Vilalta?' url='.../people/+requestmerge...'>
+
+It is possible for the preferred email address to be set if it is associated
+with an Ubuntu Single Signon account. Anonymous and logged in users cannot
+see this, but admins like Foo Bar can.
+
+    >>> from zope.component import getUtility
+    >>> from canonical.launchpad.interfaces.emailaddress import (
+    ... EmailAddressStatus, IEmailAddressSet)
+
+    >>> login('[e-mail]')
+    >>> address = getUtility(IEmailAddressSet).getByEmail('[e-mail]')
+    >>> address.status = EmailAddressStatus.PREFERRED
+    >>> transaction.commit()
+    >>> logout()
+
+    >>> anon_browser.open('https://launchpad.dev/~jvprat')
+    >>> print find_tag_by_id(anon_browser.contents, 'email-addresses')
+    None
+
+    >>> user_browser.open('https://launchpad.dev/~jvprat')
+    >>> print find_tag_by_id(user_browser.contents, 'email-addresses')
+    None
+
+    >>> admin_browser.open('https://launchpad.dev/~jvprat')
+    >>> print extract_text(
+    ...     find_tag_by_id(admin_browser.contents, 'email-addresses'))
+    [e-mail]
+    Change e-mail settings

=== modified file 'lib/lp/registry/stories/person/xx-set-preferredemail.txt'
--- lib/lp/registry/stories/person/xx-set-preferredemail.txt	2009-09-18 15:24:30 +0000
+++ lib/lp/registry/stories/person/xx-set-preferredemail.txt	2010-06-18 23:27:31 +0000
@@ -62,17 +62,3 @@
     >>> for msg in get_feedback_messages(second_browser.contents):
     ...     print msg
     [e-mail] is already set as your contact address.
-
-
-Unclaimed users
-===============
-
-An unclaimed user will probably have no contact email address.
-
-   >>> admin_browser.open('http://launchpad.dev/~matsubara')
-   >>> print admin_browser.title
-   Diogo Matsubara does not use Launchpad
-   >>> admin_browser.getLink('Change e-mail settings').click()
-   >>> print find_tag_by_id(admin_browser.contents,
-   ...                      'no-contact-address').string
-   Currently you don't have a contact address in Launchpad.

=== modified file 'lib/lp/registry/templates/person-index.pt'
--- lib/lp/registry/templates/person-index.pt	2010-04-15 22:42:41 +0000
+++ lib/lp/registry/templates/person-index.pt	2010-06-18 23:27:31 +0000
@@ -157,8 +157,10 @@
         </tal:block>
       </p>
 
-        <tal:person condition="not: view/context_is_probably_a_team">
-          <ul tal:condition="context/preferredemail">
+      <tal:person condition="not: view/context_is_probably_a_team">
+        <tal:admin tal:condition="context/required:launchpad.Admin">
+          <ul id="email-addresses"
+            tal:condition="context/preferredemail">
             <li>
               <img src="/@@/private" alt=""
                    tal:condition="view/email_address_visibility/are_allowed"/>
@@ -169,19 +171,18 @@
               <a tal:replace="structure overview_menu/editemailaddresses/fmt:icon" />
             </li>
           </ul>
-          <tal:editable tal:condition="context/required:launchpad.Edit">
-            <p tal:condition="not: context/preferredemail">
-              <tal:editemailaddresses
-                replace="structure overview_menu/editemailaddresses/fmt:link-icon" />
-            </p>
-          </tal:editable>
+        </tal:admin>
+
+        <p>
           <a tal:attributes="
             href string:/people/+requestmerge?field.dupe_person=${context/name}"
-          >Are you <span tal:replace="context/displayname" />?</a>
-        </tal:person>
-        <tal:team condition="view/context_is_probably_a_team">
-          <a href="+claimteam">Is this a team you run?</a>
-        </tal:team>
+            >Are you <span tal:replace="context/displayname" />?</a>
+        </p>
+      </tal:person>
+
+      <tal:team condition="view/context_is_probably_a_team">
+        <a href="+claimteam">Is this a team you run?</a>
+      </tal:team>
     </tal:noaccount>
 
     <tal:deactivated-account