From 11b8dd877b3ba1a3a8aec39166f025eb1f2beeb4 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@proxience.com>
Date: Fri, 24 Oct 2014 13:22:17 +0200
Subject: Display Administrativ Act after validation (refs #2084)

---
 .../templates/ishtar/sheet_administrativeact.html                     | 1 +
 archaeological_operations/wizards.py                                  | 4 ++++
 2 files changed, 5 insertions(+)

(limited to 'archaeological_operations')

diff --git a/archaeological_operations/templates/ishtar/sheet_administrativeact.html b/archaeological_operations/templates/ishtar/sheet_administrativeact.html
index 0457d9260..23dc0a4c1 100644
--- a/archaeological_operations/templates/ishtar/sheet_administrativeact.html
+++ b/archaeological_operations/templates/ishtar/sheet_administrativeact.html
@@ -13,6 +13,7 @@
 {% if item.index %}<p><label>{%trans "Numerical reference:"%}</label> <span class='value strong'>{{ item.index }}</span></p>{% endif %}
 {% if item.ref_sra %}<p><label>{%trans "Internal reference:"%}</label> <span class='value strong'>{{ item.ref_sra }}</span></p>{% endif %}
 <p><label>{%trans "Type:"%}</label> <span class='value'>{{ item.act_type }}</span></p>
+{% if item.act_object %}<p><label>{%trans "Object:"%}</label> <span class='value'>{{ item.act_object }}</span></p>{% endif %}
 <p><label>{%trans "Signature date:"%}</label> <span class='value'>{{ item.signature_date }}</span></p>
 <p><label>{%trans "In charge:"%}</label> <span class='value'>{{ item.in_charge.full_label }}</span></p>
 {% if item.operator %}<p><label>{%trans "Archaeological preventive operator:"%}</label> <span class='value'>{{ item.operator }}</span></p>{% endif %}
diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py
index 7d349b8b7..8e88a389c 100644
--- a/archaeological_operations/wizards.py
+++ b/archaeological_operations/wizards.py
@@ -280,6 +280,7 @@ class OperationSourceDeletionWizard(DeletionWizard):
 
 class OperationAdministrativeActWizard(OperationWizard):
     edit = False
+    wizard_done_window = reverse_lazy('show-administrativeact')
 
     def get_reminder(self):
         form_key = 'selec-' + self.url_name
@@ -360,6 +361,9 @@ class OperationAdministrativeActWizard(OperationWizard):
             else:
                 break
         if level == len(keys): # the whole list as been traversed
+            wizard_done_window = unicode(self.wizard_done_window)
+            if wizard_done_window:
+                dct['wizard_done_window'] = wizard_done_window
             # redirect to the generated doc
             dct['redirect'] = reverse('generatedoc-administrativeactop',
                                       args=[admact.pk, r[0]])
-- 
cgit v1.2.3