← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/registry/model/person.py

  • Committer: Launchpad Patch Queue Manager
  • Date: 2011-03-18 03:56:36 UTC
  • mfrom: (12589.4.8 person-merge-job-0)
  • Revision ID: launchpad@pqm.canonical.com-20110318035636-rk84j0rxh5jqbzyp
[r=jcsackett][bug=728471] Add sanity checks to mergeAsync.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/registry/model/person.py
2052
2052
    def is_merge_pending(self):
2053
2053
        """See `IPublicPerson`."""
2054
2054
        return not getUtility(
2055
 
            IPersonMergeJobSource).find(from_person=self).is_empty()
 
2055
            IPersonMergeJobSource).find(
 
2056
                from_person=self, to_person=self, any_person=True).is_empty()
2056
2057
 
2057
2058
    def visibilityConsistencyWarning(self, new_value):
2058
2059
        """Warning used when changing the team's visibility.