← Back to branch summary

~pidgeon690/mypidge-base/feature+publicity

« back to all changes in this revision

Viewing changes to MyPidge/Groups/viewsmanage.py

  • Committer: Fergus Ross Ferrier
  • Date: 2008-12-01 20:32:29 UTC
  • Revision ID: me@fergusrossferrier.co.uk-20081201203229-tz2yh5ylrdihckkw
User now exists in Person multi-table hierarchy.

We can add people without needing them to register. We can use existing data for a person when they try and register. It's a real bitch to use though.

Show diffs side-by-side

added added

removed removed

Lines of Context:
MyPidge/Groups/viewsmanage.py
137
137
        ''' Check the user has permissions on the group. '''
138
138
        self.user = User.objects.get(id = self.request.session['userid'])
139
139
        try:
140
 
            uga = Membership.objects.get(group=self.group, user=self.user, assoctype='CTL')
 
140
            uga = Membership.objects.get(group=self.group, person = self.user, assoctype='CTL')
141
141
        except Membership.DoesNotExist:
142
142
            raise PermissionDenied
143
143
 
191
191
            theuser = User.objects.get(id=self.userid)
192
192
            if theuser == self.user:
193
193
                raise Membership.SelfRevocation
194
 
            uga = Membership.objects.get(user__id = self.userid, group__id = self.group.id, assoctype='CTL')
 
194
            uga = Membership.objects.get(person__id = self.userid, group__id = self.group.id, assoctype='CTL')
195
195
            uga.delete()
196
196
            self.flags['user_revoked'] = True
197
197
            # TODO - email the user who has just lost the power