diff options
Diffstat (limited to 'archaeological_files/views.py')
| -rw-r--r-- | archaeological_files/views.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/archaeological_files/views.py b/archaeological_files/views.py index e55368e62..456926600 100644 --- a/archaeological_files/views.py +++ b/archaeological_files/views.py @@ -162,10 +162,13 @@ def file_administrativeactfile_document(request): dct = {} if request.POST: dct['search_form'] = AdministrativeActFileFormSelection(request.POST) - dct['template_form'] = DocumentGenerationAdminActForm(request.POST) - if dct['search_form'].is_valid() and dct['template_form'].is_valid(): - doc = dct['template_form'].save( - dct['search_form'].cleaned_data.get('pk')) + if dct['search_form'].is_valid(): + try: + act_file = AdministrativeAct.objects.get( + pk=dct['search_form'].cleaned_data.get('pk')) + doc = act_file.publish() + except AdministrativeAct.DoesNotExist: + doc = None if doc: MIMES = {'odt':'application/vnd.oasis.opendocument.text', 'ods':'application/vnd.oasis.opendocument.spreadsheet'} @@ -181,6 +184,5 @@ def file_administrativeactfile_document(request): return response else: dct['search_form'] = AdministrativeActFileFormSelection() - dct['template_form'] = DocumentGenerationAdminActForm() return render_to_response('ishtar/administrativeact_document.html', dct, context_instance=RequestContext(request)) |