summaryrefslogtreecommitdiff
path: root/ishtar_common/forms_common.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-04-07 12:16:37 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-04-07 12:16:37 +0200
commit6b87dae76d931ead9838db1f66a6ff1fe1cc1dd1 (patch)
tree0a2273d9db0499214e18a041987339eac9d20ac9 /ishtar_common/forms_common.py
parent75730c0ac55c935c03e58977405b4b8a2233595d (diff)
parent3d8b8d86f01ecb9b37e24e25fd15500b8f4fb2a0 (diff)
downloadIshtar-6b87dae76d931ead9838db1f66a6ff1fe1cc1dd1.tar.bz2
Ishtar-6b87dae76d931ead9838db1f66a6ff1fe1cc1dd1.zip
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/forms_common.py')
-rw-r--r--ishtar_common/forms_common.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py
index 078ccfb15..b317f77e3 100644
--- a/ishtar_common/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -529,11 +529,11 @@ class PersonForm(SimplePersonForm):
pk=dct['attached_to'])
except models.Organization.DoesNotExist:
dct.pop('attached_to')
- if 'title' in dct and dct['title']:
+ if 'title' in dct:
try:
dct['title'] = models.TitleType.objects.get(
pk=dct['title'])
- except models.TitleType.DoesNotExist:
+ except (models.TitleType.DoesNotExist, ValueError):
dct.pop('title')
person_types = dct.pop('person_types')
new_item = models.Person.objects.create(**dct)