Administrative act for treatment and treatment files

1 files changed, 7 insertions, 4 deletions

diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py
index ece14d1d2..94aafb87c 100644
--- a/archaeological_operations/wizards.py
+++ b/archaeological_operations/wizards.py
@@ -17,6 +17,8 @@
 
 # See the file COPYING for details.
 
+import logging
+
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.urlresolvers import reverse
@@ -33,6 +35,8 @@ from forms import GenerateDocForm
 
 from archaeological_files.models import File
 
+logger = logging.getLogger(__name__)
+
 
 class OperationWizard(Wizard):
     model = models.Operation
@@ -327,6 +331,7 @@ class OperationAdministrativeActWizard(OperationWizard):
     edit = False
     wizard_done_window = reverse_lazy('show-administrativeact')
     current_obj_slug = 'administrativeactop'
+    ref_object_key = 'operation'
 
     def get_reminder(self):
         form_key = 'selec-' + self.url_name
@@ -389,11 +394,9 @@ class OperationAdministrativeActWizard(OperationWizard):
         else:
             associated_item = self.get_associated_item(dct)
             if not associated_item:
+                logger.warning("Admin act save: no associated model")
                 return self.render(form_list[-1])
-            if isinstance(associated_item, File):
-                dct['associated_file'] = associated_item
-            elif isinstance(associated_item, models.Operation):
-                dct['operation'] = associated_item
+            dct[self.ref_object_key] = associated_item
             admact = models.AdministrativeAct(**dct)
         admact.save()
         dct['item'] = admact