Better management of document generation form (refs #2132)

* check if the document template is compatible with the selected object
* remove dead code (old document generation form)

1 files changed, 16 insertions, 4 deletions

diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index 182ae115e..ba66a724a 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -357,10 +357,22 @@ def administrativeactfile_document(request, operation=True):
     dct = {}
     if request.POST:
         dct['search_form'] = search_form(request.POST)
-        dct['template_form'] = DocumentGenerationAdminActForm(request.POST,
-                                                          operation=operation)
-        if dct['search_form'].is_valid() and dct['template_form'].is_valid():
-            return generatedoc_administrativeactop(request,
+        dct['template_form'] = DocumentGenerationAdminActForm(
+                                                        operation=operation)
+        c_object = None
+        try:
+            if dct['search_form'].is_valid():
+                c_object = \
+                   DocumentGenerationAdminActForm._associated_model.objects.get(
+                            pk=dct['search_form'].cleaned_data.get('pk'))
+        except DocumentGenerationAdminActForm._associated_model.DoesNotExist:
+            pass
+        if c_object:
+            dct['template_form'] = DocumentGenerationAdminActForm(request.POST,
+                                operation=operation,
+                                obj=c_object)
+            if dct['template_form'].is_valid():
+                return generatedoc_administrativeactop(request,
                     dct['search_form'].cleaned_data.get('pk'),
                     dct['template_form'].cleaned_data.get('document_template'))
     else: