From de4267567a154048dfeca2c1ac1de731061d1b1c Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 11 Jul 2017 14:29:38 +0200
Subject: Fix find deletion when warehouse module is activated (refs #3649)

---
 archaeological_finds/wizards.py | 1 +
 ishtar_common/wizards.py        | 9 +++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/archaeological_finds/wizards.py b/archaeological_finds/wizards.py
index 43fe6262f..b4471a80b 100644
--- a/archaeological_finds/wizards.py
+++ b/archaeological_finds/wizards.py
@@ -83,6 +83,7 @@ class FindModificationWizard(FindWizard):
 
 class FindDeletionWizard(DeletionWizard):
     model = models.Find
+    main_item_select_keys = ('selec-', 'selecw-')
     fields = ['label', 'material_types', 'datings', 'find_number',
               'object_types', 'description', 'conservatory_state', 'mark',
               'preservation_to_considers', 'integrities', 'remarkabilities',
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))
-- 
cgit v1.2.3