← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

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

Merge with trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/registry/model/mailinglist.py
389
389
                             TeamParticipation.team == self.team,
390
390
                             MailingListSubscription.person == Person.id,
391
391
                             MailingListSubscription.mailing_list == self)
392
 
        return results.order_by(Person.displayname)
 
392
        return results.order_by(Person.displayname, Person.name)
393
393
 
394
394
    def subscribe(self, person, address=None):
395
395
        """See `IMailingList`."""
451
451
                     MailingListSubscription.personID
452
452
                     == EmailAddress.personID),
453
453
            # pylint: disable-msg=C0301
454
 
            LeftJoin(MailingList,
455
 
                     MailingList.id == MailingListSubscription.mailing_listID),
 
454
            LeftJoin(
 
455
                MailingList,
 
456
                MailingList.id == MailingListSubscription.mailing_listID),
456
457
            LeftJoin(TeamParticipation,
457
458
                     TeamParticipation.personID
458
459
                     == MailingListSubscription.personID),
472
473
                     MailingListSubscription.email_addressID
473
474
                     == EmailAddress.id),
474
475
            # pylint: disable-msg=C0301
475
 
            LeftJoin(MailingList,
476
 
                     MailingList.id == MailingListSubscription.mailing_listID),
 
476
            LeftJoin(
 
477
                MailingList,
 
478
                MailingList.id == MailingListSubscription.mailing_listID),
477
479
            LeftJoin(TeamParticipation,
478
480
                     TeamParticipation.personID
479
481
                     == MailingListSubscription.personID),
664
666
                     MailingListSubscription.personID
665
667
                     == EmailAddress.personID),
666
668
            # pylint: disable-msg=C0301
667
 
            LeftJoin(MailingList,
668
 
                     MailingList.id == MailingListSubscription.mailing_listID),
 
669
            LeftJoin(
 
670
                MailingList,
 
671
                MailingList.id == MailingListSubscription.mailing_listID),
669
672
            LeftJoin(TeamParticipation,
670
673
                     TeamParticipation.personID
671
674
                     == MailingListSubscription.personID),
678
681
            team.id for team in store.find(
679
682
                Person,
680
683
                And(Person.name.is_in(team_names),
681
 
                    Person.teamowner != None))
682
 
            )
 
684
                    Person.teamowner != None)))
683
685
        list_ids = set(
684
686
            mailing_list.id for mailing_list in store.find(
685
687
                MailingList,
709
711
                     MailingListSubscription.email_addressID
710
712
                     == EmailAddress.id),
711
713
            # pylint: disable-msg=C0301
712
 
            LeftJoin(MailingList,
713
 
                     MailingList.id == MailingListSubscription.mailing_listID),
 
714
            LeftJoin(
 
715
                MailingList,
 
716
                MailingList.id == MailingListSubscription.mailing_listID),
714
717
            LeftJoin(TeamParticipation,
715
718
                     TeamParticipation.personID
716
719
                     == MailingListSubscription.personID),
756
759
            team.id for team in store.find(
757
760
                Person,
758
761
                And(Person.name.is_in(team_names),
759
 
                    Person.teamowner != None))
760
 
            )
 
762
                    Person.teamowner != None)))
761
763
        team_members = store.using(*tables).find(
762
764
            (Team.name, Person.displayname, EmailAddress.email),
763
765
            And(TeamParticipation.teamID.is_in(team_ids),