Fix person creation with new title management (refs #3187)

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: