diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-12 00:05:13 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-12 00:05:13 +0200 |
| commit | 07182d8f114eb87e9e1ae958df6c46d7dbac3b56 (patch) | |
| tree | 90fdc3f3ffc46dc609eff3928873d323e940c0e2 /ishtar_common | |
| parent | 97c568b85ae2969cf30665e6ebcc1620721e1195 (diff) | |
| parent | f2e2d4f7c7172cc84c14613ea4049ae54e75d818 (diff) | |
| download | Ishtar-07182d8f114eb87e9e1ae958df6c46d7dbac3b56.tar.bz2 Ishtar-07182d8f114eb87e9e1ae958df6c46d7dbac3b56.zip | |
Merge branch 'master' into develop
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/wizards.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ishtar_common/wizards.py b/ishtar_common/wizards.py index e8b079bf6..128833ad4 100644 --- a/ishtar_common/wizards.py +++ b/ishtar_common/wizards.py @@ -1242,10 +1242,11 @@ class DeletionWizard(Wizard): def done(self, form_list, **kwargs): obj = self.get_current_object() - try: - obj.delete() - except ObjectDoesNotExist: - pass + if obj: + try: + obj.delete() + except ObjectDoesNotExist: + pass return render_to_response( 'ishtar/wizard/wizard_delete_done.html', {}, context_instance=RequestContext(self.request)) |