summaryrefslogtreecommitdiff
path: root/archaeological_operations/wizards.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2013-12-17 01:53:53 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2013-12-17 01:53:53 +0100
commit758ee42b4970372d38d620f80c51854abc64a69f (patch)
tree10b2770b19fde76764d3a028fd01ae3ebe8176f5 /archaeological_operations/wizards.py
parent7a8588afd998504e4fabf9614d03054b424fe3e7 (diff)
downloadIshtar-758ee42b4970372d38d620f80c51854abc64a69f.tar.bz2
Ishtar-758ee42b4970372d38d620f80c51854abc64a69f.zip
Choose document to generate at the end of create/modif process
Diffstat (limited to 'archaeological_operations/wizards.py')
-rw-r--r--archaeological_operations/wizards.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py
index 86af26351..a61452733 100644
--- a/archaeological_operations/wizards.py
+++ b/archaeological_operations/wizards.py
@@ -281,7 +281,8 @@ class OperationAdministrativeActWizard(OperationWizard):
except models.ActType.DoesNotExist:
pass
if act_type and act_type.associated_template.count():
- context['extra_form'] = GenerateDocForm()
+ context['extra_form'] = GenerateDocForm(
+ choices=act_type.associated_template.all())
return context
def get_associated_item(self, dct):
@@ -323,7 +324,7 @@ class OperationAdministrativeActWizard(OperationWizard):
if level == len(keys): # the whole tree as been traversed
# redirect to the generated doc
dct['redirect'] = reverse('generatedoc-administrativeactop',
- args=[admact.pk])
+ args=[admact.pk, r[0]])
res = render_to_response('ishtar/wizard/wizard_done.html', dct,
context_instance=RequestContext(self.request))