mirror of
https://github.com/ae-utbm/sith.git
synced 2024-11-26 11:04:20 +00:00
Merge branch 'mailing' into 'master'
Fix error when deleting user from mailing when only email provided See merge request !101
This commit is contained in:
commit
b5e7a0d747
@ -307,7 +307,7 @@ class MailingSubscription(models.Model):
|
|||||||
return self.mailing.club.has_rights_in_club(user) or user.is_root or self.user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID)
|
return self.mailing.club.has_rights_in_club(user) or user.is_root or self.user.is_in_group(settings.SITH_GROUP_COM_ADMIN_ID)
|
||||||
|
|
||||||
def can_be_edited_by(self, user):
|
def can_be_edited_by(self, user):
|
||||||
return (user is not None and user.id == self.user.id)
|
return (self.user is not None and user.id == self.user.id)
|
||||||
|
|
||||||
def fetch_format(self):
|
def fetch_format(self):
|
||||||
return self.email + ' '
|
return self.email + ' '
|
||||||
|
Loading…
Reference in New Issue
Block a user