diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-11 14:49:28 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-11 14:49:28 +0200 |
| commit | 4fcc46584a2f55048173c0d718be5bf76a74127d (patch) | |
| tree | 2054df617244c89d93b7a3b678d13ea25d78a92f /ishtar_common/wizards.py | |
| parent | f64baa1026aaf79e62cd604ac94dc21382f07e5a (diff) | |
| parent | fba85439ce71086c6153cb3bb57b48567bbfad85 (diff) | |
| download | Ishtar-4fcc46584a2f55048173c0d718be5bf76a74127d.tar.bz2 Ishtar-4fcc46584a2f55048173c0d718be5bf76a74127d.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/wizards.py')
| -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 8d787d733..3f90f8c48 100644 --- a/ishtar_common/wizards.py +++ b/ishtar_common/wizards.py @@ -1232,10 +1232,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)) |