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

[Brad Crittenden]

Rework merge request pages

[Brad Crittenden (bac)]

= Summary =

Users can choose to hide their email addresses and we should always honor that
request. Currently anyone who attempts to merge a person with hidden email addresses
is shown all addresses for that user.

Also did a drive-by fix to the person picker vocabulary that was not catching an
Unauthorized exception which prevented people with hidden emails from being selected
in the picker.

== Proposed fix ==

Rather than displaying the addresses and letting the user choose which ones to
contact we should just show a count of addresses and send notification to them all.

== Pre-implementation notes ==

Quick call with Curtis as a sanity check of the approach.

== Implementation details ==

As above.

== Tests ==

bin/test -vvm lp.registry -t merge-people.txt

== Demo and Q/A ==

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/lp/registry/browser/peoplemerge.py
  lib/lp/registry/stories/person/merge-people.txt
  lib/lp/registry/interfaces/person.py
  lib/lp/registry/templates/people-requestmerge-multiple.pt
  lib/canonical/launchpad/browser/vocabulary.py

== Pylint notices ==

Non-issues:

lib/lp/registry/browser/peoplemerge.py
    250: [C0322, AdminTeamMergeView.deactivate_members_and_merge_action] Operator not
preceded by a space
    name='deactivate_members_and_merge')
    ^
    def deactivate_members_and_merge_action(self, action, data):

lib/lp/registry/interfaces/person.py
    52: [F0401] Unable to import 'lazr.enum' (No module named enum)
    53: [F0401] Unable to import 'lazr.lifecycle.snapshot' (No module named lifecycle)
    54: [F0401] Unable to import 'lazr.restful.interface' (No module named restful)
    55: [F0401] Unable to import 'lazr.restful.declarations' (No module named restful)
    62: [F0401] Unable to import 'lazr.restful.fields' (No module named restful)
    407: [E1002, PersonNameField._validate] Use super on an old style class
    1405: [C0322, IPersonEditRestricted.addMember] Operator not preceded by a space
    status=copy_field(ITeamMembership['status']),
    ^
    comment=Text(required=False))
    @export_write_operation()
    def addMember(person, reviewer, status=TeamMembershipStatus.APPROVED,
    comment=None, force_team_add=False,
    may_subscribe_to_list=True):
    1444: [C0322, IPersonEditRestricted.acceptInvitationToBeMemberOf] Operator not
preceded by a space
    comment=Text())
    ^
    @export_write_operation()
    def acceptInvitationToBeMemberOf(team, comment):
    1456: [C0322, IPersonEditRestricted.declineInvitationToBeMemberOf] Operator not
preceded by a space
    comment=Text())
    ^
    @export_write_operation()
    def declineInvitationToBeMemberOf(team, comment):
    1754: [C0322, IPersonSet.newTeam] Operator not preceded by a space
    defaultmembershipperiod='default_membership_period',
    ^
    defaultrenewalperiod='default_renewal_period')
    @operation_parameters(
    subscriptionpolicy=Choice(
    title=_('Subscription policy'), vocabulary=TeamSubscriptionPolicy,
    required=False, default=TeamSubscriptionPolicy.MODERATED))
    @export_factory_oper...

[Guilherme Salgado (salgado)]

Hi Brad,

This looks pretty good. I have only a few comments/suggestions and one
request for a missing test.

 review needsfixing

On Fri, 2010-01-08 at 13:36 +0000, Brad Crittenden wrote:
> Brad Crittenden has proposed merging lp:~bac/launchpad/bug-419930 into
> lp:launchpad/devel.
>
> Requested reviews:
> Canonical Launchpad Engineering (launchpad)
> Related bugs:
> #419930 non-public email address shown after merge request
> https://bugs.launchpad.net/bugs/419930
>
>
> = Summary =
>
> Users can choose to hide their email addresses and we should always
> honor that
> request. Currently anyone who attempts to merge a person with hidden
> email addresses
> is shown all addresses for that user.
>
> Also did a drive-by fix to the person picker vocabulary that was not
> catching an
> Unauthorized exception which prevented people with hidden emails from
> being selected
> in the picker.

Does that mean we can't merge people with hidden email addresses unless
we know their Launchpad ID or email address?

>
> == Proposed fix ==
>
> Rather than displaying the addresses and letting the user choose which
> ones to
> contact we should just show a count of addresses and send notification
> to them all.
>
> == Pre-implementation notes ==
>
> Quick call with Curtis as a sanity check of the approach.
>
> == Implementation details ==
>
> As above.
>
> == Tests ==
>
> bin/test -vvm lp.registry -t merge-people.txt
>

> === modified file 'lib/canonical/launchpad/browser/vocabulary.py'
> --- lib/canonical/launchpad/browser/vocabulary.py 2009-07-31 19:38:18 +0000
> +++ lib/canonical/launchpad/browser/vocabulary.py 2010-01-08 13:36:23 +0000
> @@ -82,7 +82,7 @@
> def person_to_pickerentry(person):
> """Adapts IPerson to IPickerEntry."""
> extra = default_pickerentry_adapter(person)
> - if person.preferredemail is not None:
> + if person.preferredemail is not None and not person.hide_email_addresses:

I didn't see a test for this; care to add one?

> extra.description = person.preferredemail.email
> return extra
>
>
> === modified file 'lib/lp/registry/browser/peoplemerge.py'
> --- lib/lp/registry/browser/peoplemerge.py 2010-01-05 15:44:09 +0000
> +++ lib/lp/registry/browser/peoplemerge.py 2010-01-08 13:36:23 +0000
> @@ -359,8 +359,7 @@
>
>
> class RequestPeopleMergeMultipleEmailsView:
> - """A view for the page where the user asks a merge and the dupe account
> - have more than one email address."""
> + """Merge request view when dupe account has multiple email addresses."""
>
> def __init__(self, context, request):
> self.context = context
> @@ -390,29 +389,38 @@
> login = getUtility(ILaunchBag).login
> logintokenset = getUtility(ILoginTokenSet)
>
> - emails = self.request.form.get("selected")
> - if emails is not None:
> - # We can have multiple email adressess selected, and in this case
> - # emails will be a list. Otherwise it will be a string and we need
> - # to make a list with that value to use in the for loop.
> - if not isinstance(emails, list):
> - em...

review: Needs Fixing

[Brad Crittenden (bac)]

> Hi Brad,
>
> This looks pretty good. I have only a few comments/suggestions and one
> request for a missing test.

Thanks for the review.

> > Also did a drive-by fix to the person picker vocabulary that was not
> > catching an
> > Unauthorized exception which prevented people with hidden emails from
> > being selected
> > in the picker.
>
> Does that mean we can't merge people with hidden email addresses unless
> we know their Launchpad ID or email address?

Currently we cannot use the picker to select people with hidden email addresses. But you can merge them by typing in the ID into the field on the form.

> > === modified file 'lib/canonical/launchpad/browser/vocabulary.py'
> > --- lib/canonical/launchpad/browser/vocabulary.py 2009-07-31 19:38:18
> +0000
> > +++ lib/canonical/launchpad/browser/vocabulary.py 2010-01-08 13:36:23
> +0000
> > @@ -82,7 +82,7 @@
> > def person_to_pickerentry(person):
> > """Adapts IPerson to IPickerEntry."""
> > extra = default_pickerentry_adapter(person)
> > - if person.preferredemail is not None:
> > + if person.preferredemail is not None and not
> person.hide_email_addresses:
>
> I didn't see a test for this; care to add one?

I have discovered Edwin is working to redo the way these pickers are working and my drive-by change would soon be replaced by his work. Therefore I'm going to back out this portion of the change and just wait for his more thorough fix.

> > === modified file 'lib/lp/registry/browser/peoplemerge.py'

> > + # We can have multiple email adressess selected, and in
> this
>
> Typo: adressess

This typo was pre-existing. I looked to see if it existed elsewhere and found and fixed six other occurrences.

> > === modified file 'lib/lp/registry/stories/person/merge-people.txt'
> > --- lib/lp/registry/stories/person/merge-people.txt 2009-07-31 22:34:24
> +0000
> > +++ lib/lp/registry/stories/person/merge-people.txt 2010-01-08 13:36:23
> +0000
> > @@ -172,3 +172,56 @@
> > #>>> browser.open('http://launchpad.dev/people/+mergerequest-
> sent?dupe=55')
> > #>>> browser.url
> > #'http://launchpad.dev/~no-priv'
> > +
> > +If the duplicate account has multiple email addresses and has chosen
> > +to hide them the process is slightly different. We cannot display the
> > +hidden addresses so instead we just inform the user to check all of
> > +them (and hope they know which ones) and we send merge request
> > +messages to them all.
> > +
> > + >>> login('<email address hidden>')
> > + >>> dupe = factory.makePerson(name="duplicate-person",
> <email address hidden>",
> > + ... hide_email_addresses=True)
> > + >>> email = factory.makeEmail(<email address hidden>", person=dupe)
> > + >>> logout()
> > +
> > +Ensure there are no leftover emails.
> > +
> > + >>> len(stub.test_emails)
> > + 0
> > +
> > +Open the merge page and merge our duplicate account with hidden email
> > +addresses.
> > +
> > + >>> browser.open('http://launchpad.dev/people/+requestmerge')
> > + >>> browser.getControl(
> > + ... 'Duplicated Account').value = 'duplicate-person'
> > + >>> browser.getC...

[Brad Crittenden (bac)]

Diff at http://pastebin.ubuntu.com/353638/

[Brad Crittenden (bac)]

Added screenshots to the bug 419930 for a UI review.

[Guilherme Salgado (salgado)]

On Fri, 2010-01-08 at 21:37 +0000, Brad Crittenden wrote:
> > > === modified file 'lib/canonical/launchpad/browser/vocabulary.py'
> > > --- lib/canonical/launchpad/browser/vocabulary.py 2009-07-31 19:38:18
> > +0000
> > > +++ lib/canonical/launchpad/browser/vocabulary.py 2010-01-08 13:36:23
> > +0000
> > > @@ -82,7 +82,7 @@
> > > def person_to_pickerentry(person):
> > > """Adapts IPerson to IPickerEntry."""
> > > extra = default_pickerentry_adapter(person)
> > > - if person.preferredemail is not None:
> > > + if person.preferredemail is not None and not
> > person.hide_email_addresses:
> >
> > I didn't see a test for this; care to add one?
>
> I have discovered Edwin is working to redo the way these pickers are
> working and my drive-by change would soon be replaced by his work.
> Therefore I'm going to back out this portion of the change and just
> wait for his more thorough fix.

Ok, do you mind filing a bug and assigning it to him, just to make sure
it's not forgotten?

>
>
> > > === modified file 'lib/lp/registry/browser/peoplemerge.py'
>
> > > + # We can have multiple email adressess selected, and in
> > this
> >
> > Typo: adressess
>
> This typo was pre-existing. I looked to see if it existed elsewhere and found and fixed six other occurrences.
>

Nice, thanks!

 review approve

--
Guilherme Salgado <email address hidden>

review: Approve

[Martin Albisetti (beuno)]

Thanks for the changes.

review: Approve (ui)

=== modified file 'lib/canonical/launchpad/doc/tales.txt'
--- lib/canonical/launchpad/doc/tales.txt	2010-01-12 09:12:59 +0000
+++ lib/canonical/launchpad/doc/tales.txt	2010-01-15 01:40:24 +0000
@@ -1111,7 +1111,7 @@
     >>> test_tales('foo/fmt:linkify-email', foo='[e-mail]')
     '[e-mail]'
 
-Users who specifiy that their email adresses must be hidden also do not
+Users who specify that their email addresses must be hidden also do not
 get linkified.  [e-mail] is hidden:
 
     >>> person_set = getUtility(IPersonSet)
@@ -1583,4 +1583,3 @@
 
     >>> test_tales("team/fmt:unique_displayname", team=myteam)
     u'<hidden>'
-
 
=== modified file 'lib/canonical/launchpad/interfaces/launchpad.py'
--- lib/canonical/launchpad/interfaces/launchpad.py	2010-01-08 16:16:50 +0000
+++ lib/canonical/launchpad/interfaces/launchpad.py	2010-01-15 01:40:24 +0000
@@ -612,7 +612,7 @@
         should be a short code that will appear in an
         X-Launchpad-Message-Rationale header for automatic filtering.
 
-        :param person_or_email: An `IPerson` or email adress that is in the
+        :param person_or_email: An `IPerson` or email address that is in the
             recipients list.
 
         :raises UnknownRecipientError: if the person or email isn't in the
 
=== modified file 'lib/canonical/launchpad/pagetitles.py'
--- lib/canonical/launchpad/pagetitles.py	2009-11-23 03:10:04 +0000
+++ lib/canonical/launchpad/pagetitles.py	2010-01-15 01:40:24 +0000
@@ -526,10 +526,6 @@
 
 people_mergerequest_sent = 'Merge request sent'
 
-people_requestmerge = 'Merge Launchpad accounts'
-
-people_requestmerge_multiple = 'Merge Launchpad accounts'
-
 person_answer_contact_for = ContextDisplayName(
     'Projects for which %s is an answer contact')
 
 
=== modified file 'lib/lp/bugs/doc/externalbugtracker-bug-imports.txt'
--- lib/lp/bugs/doc/externalbugtracker-bug-imports.txt	2009-06-15 11:10:49 +0000
+++ lib/lp/bugs/doc/externalbugtracker-bug-imports.txt	2010-01-15 01:40:24 +0000
@@ -76,9 +76,9 @@
 account is marked as NEW, since we don't know whether it's valid.
 
     >>> from canonical.launchpad.interfaces import IEmailAddressSet
-    >>> reporter_email_adresses = getUtility(IEmailAddressSet).getByPerson(
+    >>> reporter_email_addresses = getUtility(IEmailAddressSet).getByPerson(
     ...     bug.owner)
-    >>> for email_address in reporter_email_adresses:
+    >>> for email_address in reporter_email_addresses:
     ...     print "%s: %s" % (email_address.email, email_address.status.name)
     [e-mail]: NEW
     >>> print bug.owner.preferredemail
 
=== modified file 'lib/lp/registry/browser/peoplemerge.py'
--- lib/lp/registry/browser/peoplemerge.py	2010-01-05 15:44:09 +0000
+++ lib/lp/registry/browser/peoplemerge.py	2010-01-15 01:40:24 +0000
@@ -11,7 +11,8 @@
     'DeleteTeamView',
     'FinishedPeopleMergeRequestView',
     'RequestPeopleMergeMultipleEmailsView',
-    'RequestPeopleMergeView']
+    'RequestPeopleMergeView',
+    ]
 
 
 from zope.component import getUtility
@@ -44,6 +45,7 @@
     """
 
     label = 'Merge Launchpad accounts'
+    page_title = label
     schema = IRequestPeopleMerge
 
     @property
@@ -359,8 +361,10 @@
 
 
 class RequestPeopleMergeMultipleEmailsView:
-    """A view for the page where the user asks a merge and the dupe account
-    have more than one email address."""
+    """Merge request view when dupe account has multiple email addresses."""
+
+    label = 'Merge Launchpad accounts'
+    page_title = label
 
     def __init__(self, context, request):
         self.context = context
@@ -368,6 +372,7 @@
         self.form_processed = False
         self.dupe = None
         self.notified_addresses = []
+        self.user = getUtility(ILaunchBag).user
 
     def processForm(self):
         dupe = self.request.form.get('dupe')
@@ -386,33 +391,46 @@
             return
 
         self.form_processed = True
-        user = getUtility(ILaunchBag).user
         login = getUtility(ILaunchBag).login
         logintokenset = getUtility(ILoginTokenSet)
 
-        emails = self.request.form.get("selected")
-        if emails is not None:
-            # We can have multiple email adressess selected, and in this case
-            # emails will be a list. Otherwise it will be a string and we need
-            # to make a list with that value to use in the for loop.
-            if not isinstance(emails, list):
-                emails = [emails]
-
-            for email in emails:
-                emailaddress = emailaddrset.getByEmail(email)
-                assert emailaddress in self.dupeemails
-                token = logintokenset.new(
-                    user, login, email, LoginTokenType.ACCOUNTMERGE)
-                token.sendMergeRequestEmail()
-                self.notified_addresses.append(email)
-
-    # XXX: salgado, 2008-07-02: We need to somehow disclose the dupe person's
-    # email addresses so that the logged in user knows where to look for the
-    # message with instructions to finish the merge. Since people can choose
-    # to have their email addresses hidden, we need to remove the security
-    # proxy here to ensure they can be shown in this page.
-    @property
-    def naked_dupeemails(self):
-        """Non-security-proxied email addresses of the dupe person."""
-        from zope.security.proxy import removeSecurityProxy
-        return [removeSecurityProxy(email) for email in self.dupeemails]
+        email_addresses = []
+        if self.email_hidden:
+            # If the email addresses are hidden we must send a merge request
+            # to each of them.  But first we've got to remove the security
+            # proxy so we can get to them.
+            from zope.security.proxy import removeSecurityProxy
+            email_addresses = [removeSecurityProxy(email).email
+                               for email in self.dupeemails]
+        else:
+            # Otherwise we send a merge request only to the ones the user
+            # selected.
+            emails = self.request.form.get("selected")
+            if emails is not None:
+                # We can have multiple email addresses selected, and in this
+                # case emails will be a list. Otherwise it will be a string
+                # and we need to make a list with that value to use in the for
+                # loop.
+                if not isinstance(emails, list):
+                    emails = [emails]
+
+                for emailaddress in emails:
+                    email = emailaddrset.getByEmail(emailaddress)
+                    assert email in self.dupeemails
+                    email_addresses.append(emailaddress)
+
+        for emailaddress in email_addresses:
+            token = logintokenset.new(
+                self.user, login, emailaddress, LoginTokenType.ACCOUNTMERGE)
+            token.sendMergeRequestEmail()
+            self.notified_addresses.append(emailaddress)
+
+    @property
+    def cancel_url(self):
+        """Cancel URL."""
+        return canonical_url(self.user)
+
+    @property
+    def email_hidden(self):
+        """Does the duplicate account hide email addresses?"""
+        return self.dupe.hide_email_addresses
 
=== modified file 'lib/lp/registry/interfaces/person.py'
--- lib/lp/registry/interfaces/person.py	2010-01-13 23:18:29 +0000
+++ lib/lp/registry/interfaces/person.py	2010-01-15 01:40:24 +0000
@@ -96,6 +96,7 @@
 from canonical.launchpad.webapp.interfaces import NameLookupFailed
 from canonical.launchpad.webapp.authorization import check_permission
 
+
 PRIVATE_TEAM_PREFIX = 'private-'
 
 
@@ -333,7 +334,7 @@
     MODERATED = DBItem(1, """
         Moderated Team
 
-        All subscriptions for this team are subject to approval by one of 
+        All subscriptions for this team are subject to approval by one of
         the team's administrators.
         """)
 
@@ -366,17 +367,17 @@
     PRIVATE_MEMBERSHIP = DBItem(20, """
         Private Membership
 
-        Only Launchpad admins and team members can view the 
-        membership list for this team. The team is severely restricted in the 
+        Only Launchpad admins and team members can view the
+        membership list for this team. The team is severely restricted in the
         roles it can assume.
         """)
 
     PRIVATE = DBItem(30, """
         Private
 
-        Only Launchpad admins and team members can view the membership list 
-        for this team or its name.  The team roles are restricted to 
-        subscribing to bugs, being bug supervisor, owning code branches, and 
+        Only Launchpad admins and team members can view the membership list
+        for this team or its name.  The team roles are restricted to
+        subscribing to bugs, being bug supervisor, owning code branches, and
         having a PPA.
         """)
 
@@ -1850,7 +1851,7 @@
         While we don't have Full Text Indexes in the emailaddress table, we'll
         be trying to match the text only against the beginning of an email
         address.
-        
+
         If created_before or created_after are not None, they are used to
         restrict the search to the dates provided.
         """
 
=== modified file 'lib/lp/registry/stories/person/merge-people.txt'
--- lib/lp/registry/stories/person/merge-people.txt	2009-07-31 22:34:24 +0000
+++ lib/lp/registry/stories/person/merge-people.txt	2010-01-15 01:40:24 +0000
@@ -63,8 +63,10 @@
     >>> browser.getControl(
     ...     'Duplicated Account').value = 'foo'
     >>> browser.getControl('Continue').click()
-    >>> 'has more than one registered e-mail address' in browser.contents
-    True
+    >>> explanation = find_tag_by_id(browser.contents, 'explanation')
+    >>> print extract_text(explanation)
+    The account...has more than one registered e-mail address...
+
 
 Make sure we haven't got leftovers from a previous test
 
@@ -76,9 +78,10 @@
     >>> email_select_control = browser.getControl(name='selected')
     >>> for ctrl in email_select_control.controls:
     ...     ctrl.selected = True
-    >>> browser.getControl('Submit').click()
-    >>> 'Individual email messages were sent to' in browser.contents
-    True
+    >>> browser.getControl('Merge Accounts').click()
+    >>> confirmation = find_tag_by_id(browser.contents, 'confirmation')
+    >>> print extract_text(confirmation)
+    Confirmation email messages were sent to:...
     >>> '[e-mail]' in browser.contents
     True
     >>> '[e-mail]' in browser.contents
@@ -107,7 +110,7 @@
     True
 
 User confirms the merge request submitting the form, but the merge wasn't
-finished because the duplicate account still have a registered email adresses.
+finished because the duplicate account still have a registered email addresses.
 
     >>> browser.getControl('Confirm').click()
     >>> 'has other registered e-mail addresses too' in browser.contents
@@ -172,3 +175,57 @@
     #>>> browser.open('http://launchpad.dev/people/+mergerequest-sent?dupe=55')
     #>>> browser.url
     #'http://launchpad.dev/~no-priv'
+
+If the duplicate account has multiple email addresses and has chosen
+to hide them the process is slightly different.  We cannot display the
+hidden addresses so instead we just inform the user to check all of
+them (and hope they know which ones) and we send merge request
+messages to them all.
+
+    >>> login('[e-mail]')
+    >>> dupe = factory.makePerson(name="duplicate-person", email="[e-mail]",
+    ...                           hide_email_addresses=True)
+    >>> email = factory.makeEmail(address="[e-mail]", person=dupe)
+    >>> logout()
+
+Ensure there are no leftover emails.
+
+    >>> len(stub.test_emails)
+    0
+
+Open the merge page and merge our duplicate account with hidden email
+addresses.
+
+    >>> browser.open('http://launchpad.dev/people/+requestmerge')
+    >>> browser.getControl(
+    ...     'Duplicated Account').value = 'duplicate-person'
+    >>> browser.getControl('Continue').click()
+
+    >>> explanation = find_tag_by_id(browser.contents, 'explanation')
+    >>> print extract_text(explanation)
+    The account...has 2 registered e-mail addresses...
+
+
+Since the addresses are hidden we cannot display them therefore there
+are no controls to select.
+
+    >>> email_select_control = browser.getControl(name='selected')
+    Traceback (most recent call last):
+    ...
+    LookupError: name 'selected'
+
+    >>> browser.getControl('Merge Accounts').click()
+
+    >>> len(stub.test_emails)
+    2
+
+    >>> confirmation = find_tag_by_id(browser.contents, 'confirmation')
+    >>> print extract_text(confirmation)
+    Confirmation email messages were sent to the 2 registered e-mail addresses...
+
+    >>> maincontent = extract_text(find_main_content(browser.contents))
+
+    >>> '[e-mail]' in maincontent
+    False
+    >>> '[e-mail]' in maincontent
+    False
 
=== modified file 'lib/lp/registry/templates/people-requestmerge-multiple.pt'
--- lib/lp/registry/templates/people-requestmerge-multiple.pt	2009-08-31 19:53:54 +0000
+++ lib/lp/registry/templates/people-requestmerge-multiple.pt	2010-01-15 01:40:24 +0000
@@ -14,59 +14,102 @@
 >
   <body>
     <div metal:fill-slot="main">
-      <h1 tal:condition="not: view/dupe">No account found to merge</h1>
+      <p tal:condition="not: view/dupe">No account found to merge</p>
       <tal:duplicate condition="view/dupe">
         <tal:block tal:condition="not: view/form_processed">
-          <h1>Merge accounts</h1>
-
-      <p>
-        The account <code tal:content="view/dupe/name">foo</code>,
-        which you&#8217;re trying to merge,
-        has more than one registered e-mail address.
-        To complete the merge, you need to prove that you have access to
-        all e-mail addresses registered for this account.
-        To do this, select all of them and click <samp>Submit</samp>.
-        If you don&#8217;t have access to one or more of these addresses,
-        Launchpad will not be able to merge the account into your existing one,
-        but any other addresses will be transferred to your account.
-      </p>
-
-      <form name="mergerequest" action="" method="POST">
-      <input type="hidden" name="dupe" tal:attributes="value request/dupe" />
-      <table>
-        <tr tal:repeat="email view/naked_dupeemails">
-          <td>
-            <input type="checkbox" name="selected" checked="checked"
-                   tal:attributes="value email/email" />
-          </td>
-          <td tal:content="email/email">
-          </td>
-        </tr>
-        <tr>
-          <td colspan="2" align="right">
-            <input type="submit" value="Submit" />
-          </td>
-        </tr>
-      </table>
-      </form>
-    </tal:block>
-
-    <tal:block tal:condition="view/form_processed">
-      <h1>Confirmation mail sent</h1>
-
-      <p>Individual email messages were sent to
-        <tal:block repeat="email view/notified_addresses">
-          <strong tal:content="email"
-            /><span tal:condition="not: repeat/email/end">, </span>
-        </tal:block>.
-        Please follow the instructions on each of those messages to complete
-        the merge.
-      </p>
-    </tal:block>
-
-  </tal:duplicate>
-</div> 
-
-</body>
+
+          <div style="margin-top: 1em;">
+
+            <tal:email_visible condition="not: view/email_hidden">
+              <p id="explanation">
+              The account <code tal:content="view/dupe/name">foo</code>
+              has more than one registered e-mail address.
+              You need to prove that you have access to
+              all e-mail addresses registered for this account.
+              Unselect any you cannot access.
+              If you don&#8217;t have access to one or more of these addresses,
+              Launchpad will not be able to merge the account but all confirmed
+              addresses will be transferred to your account.
+              </p>
+
+              <form name="mergerequest" action="" method="POST">
+                <input type="hidden" name="dupe" tal:attributes="value request/dupe" />
+                <table>
+                  <tr tal:repeat="email view/dupeemails">
+                    <td>
+                      <input type="checkbox" name="selected" checked="checked"
+                             tal:attributes="value email/email" />
+                      <span tal:content="email/email" />
+                    </td>
+                  </tr>
+                  <tr>
+                    <td>
+                      <input type="submit" value="Merge Accounts" />
+                      or <a href tal:attributes="href view/cancel_url">Cancel</a>
+                    </td>
+                  </tr>
+                </table>
+              </form>
+            </tal:email_visible>
+
+            <tal:email_hidden condition="view/email_hidden">
+              <p id="explanation">
+                The account <code tal:content="view/dupe/name">foo</code>
+                has <span tal:replace="view/dupeemails/count" /> registered
+                e-mail addresses but they are hidden.
+                You need to prove that you have access to
+                all e-mail addresses registered for this account.
+              </p>
+              <p>
+                To do so, click the button.  An email will be sent to each
+                address on file for the duplicate account.  Follow the
+                instructions for each email.
+                If you don&#8217;t have access to some of these addresses,
+                Launchpad will not be able to merge the account.
+                The addresses you verify will be transferred to your account.
+              </p>
+
+              <form name="mergerequest" action="" method="POST">
+                <input type="hidden" name="dupe" tal:attributes="value request/dupe" />
+                <input type="submit" value="Merge Accounts" />
+                or <a href tal:attributes="href view/cancel_url">Cancel</a>
+              </form>
+            </tal:email_hidden>
+          </div>
+        </tal:block>
+
+        <tal:block tal:condition="view/form_processed">
+
+          <tal:email_visible condition="not: view/email_hidden">
+            <p id="confirmation">
+              Confirmation email messages were sent to:
+            </p>
+            <tal:block repeat="email view/notified_addresses">
+              <p><strong tal:content="email"/></p>
+            </tal:block>
+          </tal:email_visible>
+
+          <tal:email_hidden condition="view/email_hidden">
+            <p id="confirmation">
+              Confirmation email messages were sent to the
+              <span tal:content="view/dupeemails/count" /> registered
+              e-mail addresses for
+              <code tal:content="view/dupe/name">foo</code>.
+            </p>
+          </tal:email_hidden>
+
+          <p>
+            Please follow the instructions on each of those messages to complete
+            the merge.
+          </p>
+          <p>
+            <a href tal:attributes="href view/cancel_url">Back to my account</a>
+          </p>
+
+        </tal:block>
+
+      </tal:duplicate>
+    </div>
+  </body>
 </html>
 </tal:root>
 
=== modified file 'lib/lp/soyuz/browser/sourcepackagerelease.py'
--- lib/lp/soyuz/browser/sourcepackagerelease.py	2010-01-06 11:59:21 +0000
+++ lib/lp/soyuz/browser/sourcepackagerelease.py	2010-01-15 01:40:24 +0000
@@ -84,7 +84,7 @@
 
 
 def extract_email_addresses(text):
-    '''Unique email adresses in the text.'''
+    '''Unique email addresses in the text.'''
     matches = re.finditer(FormattersAPI._re_email, text)
     return list(set([match.group() for match in matches]))