summaryrefslogtreecommitdiff
path: root/ishtar_common/models.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2019-04-08 17:02:56 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2019-04-24 19:42:35 +0200
commit8d480e2dfef30252f9ef35c60c66e8876fd464f1 (patch)
tree75958b276b6976439feed600807ec32b01a88a07 /ishtar_common/models.py
parentbc470e8759a77bb8ab150403232596598dcf3b4c (diff)
downloadIshtar-8d480e2dfef30252f9ef35c60c66e8876fd464f1.tar.bz2
Ishtar-8d480e2dfef30252f9ef35c60c66e8876fd464f1.zip
Fix person merge when the target have an ishtar profile (refs #4477)
Diffstat (limited to 'ishtar_common/models.py')
-rw-r--r--ishtar_common/models.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 9bcfd4930..a3e0302aa 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -3998,7 +3998,10 @@ def post_save_userprofile(sender, **kwargs):
if not kwargs.get('instance'):
return
instance = kwargs.get('instance')
- instance.person.ishtaruser.show_field_number(update=True)
+ try:
+ instance.person.ishtaruser.show_field_number(update=True)
+ except IshtarUser.DoesNotExist:
+ return
post_save.connect(post_save_userprofile, sender=UserProfile)