DGNum/poulpe
6
0
Fork 0
Code Issues 5 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Modèles de commentaires et de notifications #18

Merged
lstephan merged 21 commits from Aufinal/communication_models into master 2017-07-21 16:58:51 +02:00
Conversation 24 Commits 21 Files changed 16 +3 -3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 782cb34b0e - Show all commits

6
event/models.py
View file

@ -178,7 +178,7 @@ class Activity(AbstractActivityTemplate):
inherited_fields = [f.name for f in ActivityTemplate._meta.get_fields()]
m2m_fields = [f.name for f in ActivityTemplate._meta.get_fields()
if f.many_to_many]
attr = super(Activity, self).__getattribute__(attrname)
attr = getattr(self, attrname)
if attrname not in inherited_fields:
raise FieldError(
_("%(attrname)s n'est pas un champ héritable"),
@ -188,9 +188,9 @@ class Activity(AbstractActivityTemplate):
if attr.exists():
return attr
else:
return self.parent.__getattribute__(attrname)
return getattr(self.parent, attrname)
elif attr is None:
return self.parent.__getattribute__(attrname)
return getattr(self.parent, attrname)
else:
return attr