← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/registry/browser/peoplemerge.py

  • Committer: Curtis Hovey
  • Date: 2011-04-08 22:39:03 UTC
  • mto: This revision was merged to the branch mainline in revision 12803.
  • Revision ID: curtis.hovey@canonical.com-20110408223903-0lwtthstslcvjjzi
Updated the merge views to queue a merge job.
Updated tests to verify a merge is queued.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/registry/browser/peoplemerge.py
90
90
    # subclasses.
91
91
    should_confirm_email_reassignment = False
92
92
    should_confirm_member_deactivation = False
93
 
    merge_message = _('Merge completed successfully.')
 
93
    merge_message = _(
 
94
        'A merge is queued and is expected to complete in a few minutes.')
94
95
 
95
96
    dupe_person_emails = ()
96
97
    dupe_person = None
138
139
                naked_email.personID = self.target_person.id
139
140
                naked_email.accountID = self.target_person.accountID
140
141
                naked_email.status = EmailAddressStatus.NEW
141
 
        getUtility(IPersonSet).merge(
 
142
        job = getUtility(IPersonSet).mergeAsync(
142
143
            self.dupe_person, self.target_person, reviewer=self.user)
143
144
        self.request.response.addInfoNotification(self.merge_message)
144
145
        self.next_url = self.success_url
251
252
 
252
253
    page_title = 'Delete'
253
254
    field_names = ['dupe_person', 'target_person']
254
 
    merge_message = _('Team deleted.')
 
255
    merge_message = _('The team is queued to be deleted.')
255
256
 
256
257
    @property
257
258
    def label(self):