summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-09-06 12:19:34 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-09-06 12:19:34 +0200
commit69e66b06d4f9f0e72d2c60edcee406d52169b61e (patch)
tree3b07e34b3f75a16b1e278b51eb783f38fd90971c /ishtar_common
parent950d981f9e567e49bd2ce1f9ff24f9203524c50c (diff)
downloadIshtar-69e66b06d4f9f0e72d2c60edcee406d52169b61e.tar.bz2
Ishtar-69e66b06d4f9f0e72d2c60edcee406d52169b61e.zip
Fix person creation with new title management (refs #3187)
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/forms_common.py13
1 files changed, 11 insertions, 2 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py
index 2788283db..7a77a6615 100644
--- a/ishtar_common/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -412,8 +412,17 @@ class PersonForm(SimplePersonForm):
dct = self.cleaned_data
dct['history_modifier'] = user
if 'attached_to' in dct and dct['attached_to']:
- dct['attached_to'] = models.Organization.objects.get(
- pk=dct['attached_to'])
+ try:
+ dct['attached_to'] = models.Organization.objects.get(
+ pk=dct['attached_to'])
+ except models.Organization.DoesNotExist:
+ dct.pop('attached_to')
+ if 'title' in dct and dct['title']:
+ try:
+ dct['title'] = models.TitleType.objects.get(
+ pk=dct['title'])
+ except models.TitleType.DoesNotExist:
+ dct.pop('title')
person_types = dct.pop('person_types')
new_item = models.Person.objects.create(**dct)
for pt in person_types: