Merge branch 'develop'

1 files changed, 2 insertions, 24 deletions

diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index 48d7c4a4f..06b8b6ce9 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -52,6 +52,7 @@ from ishtar_common.forms import ClosingDateFormSelection, FinalForm, \
 from ishtar_common.models import get_current_profile, IshtarSiteProfile, \
     DocumentTemplate
 from ishtar_common.utils import put_session_message, check_rights_condition
+from ishtar_common.views import gen_generate_doc
 from ishtar_common.views_item import get_item, show_item, revert_item, new_item
 from ishtar_common.wizards import SearchWizard
 
@@ -466,30 +467,7 @@ administrativact_register_wizard = SearchWizard.as_view([
     url_name='administrativact_register',)
 
 
-def generatedoc_administrativeactop(request, pk, template_pk=None):
-    if (not request.user.has_perm(
-            'ishtar_common.view_operation', models.Operation)
-        and not request.user.has_perm(
-            'ishtar_common.view_own_operation', models.Operation)):
-        return HttpResponse(content_type='text/plain')
-    try:
-        act_file = models.AdministrativeAct.objects.get(pk=pk)
-        doc = act_file.publish(template_pk)
-    except models.AdministrativeAct.DoesNotExist:
-        doc = None
-    if doc:
-        MIMES = {'odt': 'application/vnd.oasis.opendocument.text',
-                 'ods': 'application/vnd.oasis.opendocument.spreadsheet'}
-        ext = doc.split('.')[-1]
-        doc_name = act_file.get_filename() + "." + ext
-        mimetype = 'text/csv'
-        if ext in MIMES:
-            mimetype = MIMES[ext]
-        response = HttpResponse(open(doc), content_type=mimetype)
-        response['Content-Disposition'] = 'attachment; filename=%s' % \
-            doc_name
-        return response
-    return HttpResponse(content_type='text/plain')
+generatedoc_administrativeactop = gen_generate_doc(models.AdministrativeAct)
 
 
 def administrativeactfile_document(