diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-11 14:50:53 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-07-11 14:50:53 +0200 |
commit | 02c349dc5605586226de7c5cdc72d3a0c7495e2b (patch) | |
tree | d726836911699234f9921bc23d5bedebf57985d1 /ishtar_common/wizards.py | |
parent | bac43478fb56bf44ab61b1979bbcdaa7dffd7b7b (diff) | |
parent | 4fcc46584a2f55048173c0d718be5bf76a74127d (diff) | |
download | Ishtar-02c349dc5605586226de7c5cdc72d3a0c7495e2b.tar.bz2 Ishtar-02c349dc5605586226de7c5cdc72d3a0c7495e2b.zip |
Merge branch 'v0.9' into wheezy
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)) |