summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@proxience.com>2014-12-12 15:32:26 +0100
committerÉtienne Loks <etienne.loks@proxience.com>2014-12-12 15:32:26 +0100
commitfdfc5317c1c78c1a841bca854619ce565c1de920 (patch)
treecb9f6e2c7e90fb2725ae318ef5748dde77ac6a96
parentdc5b18032e048b1e534deeac9b961d484db440d4 (diff)
downloadIshtar-fdfc5317c1c78c1a841bca854619ce565c1de920.tar.bz2
Ishtar-fdfc5317c1c78c1a841bca854619ce565c1de920.zip
Adminastriv Act: don't generate a doc if not asked at the last step (refs #2133)
-rw-r--r--archaeological_operations/wizards.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py
index 8e88a389c..5545dd666 100644
--- a/archaeological_operations/wizards.py
+++ b/archaeological_operations/wizards.py
@@ -352,21 +352,20 @@ class OperationAdministrativeActWizard(OperationWizard):
# check if a doc generation is required
keys = [self.storage.prefix, 'step_data', 'final-' + self.url_name,
'doc_generation']
- level = 0
r = self.request.session
for k in keys:
if k in r and r[k]:
- level += 1
r = r[k]
else:
break
- if level == len(keys): # the whole list as been traversed
+ if k == keys[-1]: # 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]])
+ if r[0]:
+ dct['redirect'] = reverse('generatedoc-administrativeactop',
+ args=[admact.pk, r[0]])
res = render_to_response('ishtar/wizard/wizard_done.html', dct,
context_instance=RequestContext(self.request))