fix merging

This commit is contained in:
2017-06-13 10:48:04 +02:00
parent 69c95cfd37
commit 9447de4468
4 changed files with 19 additions and 17 deletions

View File

@ -117,12 +117,12 @@ class TrombiUser(models.Model):
else:
end_date = ""
TrombiClubMembership(
user=self,
club=str(m.club),
role=role[:64],
start=get_semester(m.start_date),
end=end_date,
).save()
user=self,
club=str(m.club),
role=role[:64],
start=get_semester(m.start_date),
end=end_date,
).save()
class TrombiComment(models.Model):
@ -140,6 +140,7 @@ class TrombiComment(models.Model):
return False
return user.id == self.author.user.id or user.can_edit(self.author.trombi)
class TrombiClubMembership(models.Model):
"""
This represent a membership to a club