diff options
Diffstat (limited to 'archaeological_files/views.py')
| -rw-r--r-- | archaeological_files/views.py | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/archaeological_files/views.py b/archaeological_files/views.py index e55368e62..699335a56 100644 --- a/archaeological_files/views.py +++ b/archaeological_files/views.py @@ -18,12 +18,10 @@ # See the file COPYING for details. import json -import os from django.db.models import Q from django.http import HttpResponse from django.shortcuts import render_to_response -from django.template.defaultfilters import slugify from django.utils.translation import ugettext_lazy as _ from ishtar_common.views import get_item, show_item, revert_item @@ -36,6 +34,8 @@ from ishtar_common.forms_common import TownFormset from archaeological_operations.forms import ParcelFormSet from forms import * +from archaeological_operations.views import generatedoc_administrativeactop + def autocomplete_file(request): if not request.user.has_perm('ishtar_common.view_file', models.File) and \ not request.user.has_perm('ishtar_common.view_own_file', models.File) \ @@ -162,25 +162,10 @@ 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 doc: - MIMES = {'odt':'application/vnd.oasis.opendocument.text', - 'ods':'application/vnd.oasis.opendocument.spreadsheet'} - ext = doc.split('.')[-1] - doc_name = slugify(doc.split(os.path.sep)[-1][:-len(ext)])+ "."\ - + ext - mimetype = 'text/csv' - if ext in MIMES: - mimetype = MIMES[ext] - response = HttpResponse(open(doc), mimetype=mimetype) - response['Content-Disposition'] = 'attachment; filename=%s' % \ - doc_name - return response + if dct['search_form'].is_valid(): + return generatedoc_administrativeactop(request, + dct['search_form'].cleaned_data.get('pk')) else: dct['search_form'] = AdministrativeActFileFormSelection() - dct['template_form'] = DocumentGenerationAdminActForm() return render_to_response('ishtar/administrativeact_document.html', dct, context_instance=RequestContext(request)) |