From 7f5a100fd07af4b8be51f524b81ae9d8776ca9b0 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 9 Apr 2018 19:06:10 +0200 Subject: Profile: default->current --- ishtar_common/models.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'ishtar_common/models.py') diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 7c2069309..9aaf7bab1 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2471,20 +2471,17 @@ class Person(Address, Merge, OwnPerms, ValueGetter): for attr in ['title', 'salutation'] if getattr(self, attr)]) @property - def default_profile(self): - q = self.profiles.filter(default=True) + def current_profile(self): + q = self.profiles.filter(current=True) if q.count(): return q.all()[0] q = self.profiles nb = q.count() if not nb: return - if nb > 1: - # arbitrary return the first one - return q.all()[0] - # if there is only one it is the default + # arbitrary set the first one as the current profile = q.all()[0] - profile.default = True + profile.current = True profile.save() return profile @@ -2665,7 +2662,7 @@ post_delete.connect(post_save_cache, sender=ProfileType) class UserProfile(models.Model): profile_type = models.ForeignKey( ProfileType, verbose_name=_(u"Profile type")) - default = models.BooleanField(_(u"Default profile"), default=False) + current = models.BooleanField(_(u"Current profile"), default=False) person = models.ForeignKey( Person, verbose_name=_(u"Person"), related_name='profiles') -- cgit v1.2.3