diff options
| author | Valérie-Emma Leroux <emma@iggdrasil.net> | 2017-04-07 11:40:31 +0200 |
|---|---|---|
| committer | Valérie-Emma Leroux <emma@iggdrasil.net> | 2017-04-07 11:40:31 +0200 |
| commit | 7f22d3c20cc24debfe123425efa63ec5293e4b4c (patch) | |
| tree | f773b80964981c231c892ee5255b94285bc5620a /ishtar_common/forms_common.py | |
| parent | 9127307734c85b816ac7dbb539b565ffb106d60f (diff) | |
| parent | da4af2ab5d105f6d2ce442b517e532b7570616e3 (diff) | |
| download | Ishtar-7f22d3c20cc24debfe123425efa63ec5293e4b4c.tar.bz2 Ishtar-7f22d3c20cc24debfe123425efa63ec5293e4b4c.zip | |
Merge branch 'master' of git.iggdrasil.net:/srv/git/ishtar
Conflicts:
archaeological_operations/templates/ishtar/sheet_operation.html
Diffstat (limited to 'ishtar_common/forms_common.py')
| -rw-r--r-- | ishtar_common/forms_common.py | 4 |
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) |