Commit b5e7a0d7 authored by Skia's avatar Skia 🤘
Browse files

Merge branch 'mailing' into 'master'

Fix error when deleting user from mailing when only email provided

See merge request !101
parents 6c66ae6b f65f261c
Pipeline #1165 passed with stage
in 4 minutes and 10 seconds
......@@ -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)
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):
return self.email + ' '
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment