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

Change get_herited method

Browse source
This commit is contained in:
Ludovic Stephan 2017-07-21 16:24:53 +02:00
parent ef8c62835b
commit 782cb34b0e
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
event/models.py
View file

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