Document generation: no more specific action -> available on the sheet

3 files changed, 12 insertions, 9 deletions

diff --git a/archaeological_operations/ishtar_menu.py b/archaeological_operations/ishtar_menu.py
index 4baf14295..bfc027573 100644
--- a/archaeological_operations/ishtar_menu.py
+++ b/archaeological_operations/ishtar_menu.py
@@ -82,11 +82,6 @@ MENU_SECTIONS = [
                         _(u"Deletion"),
                         model=models.AdministrativeAct,
                         access_controls=['change_administrativeact']),
-                    MenuItem(
-                        'operation_administrativeact_document',
-                        _(u"Documents"),
-                        model=models.AdministrativeAct,
-                        access_controls=['change_administrativeact']),
                 ],),
         ]),
      ),
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index a0d0ba30b..d1a8b5875 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -1866,6 +1866,16 @@ class AdministrativeAct(BaseHistorizedItem, OwnPerms, ValueGetter):
         if self.treatment_file:
             return self.treatment_file
 
+    def get_extra_templates(self, request):
+        templates = []
+        for template in self.act_type.associated_template.all():
+            urlname = "generatedoc-administrativeactop"
+            templates.append(
+                (template.name, reverse(
+                    urlname, args=[self.pk, template.pk]))
+            )
+        return templates
+
     def get_filename(self):
         filename = self.related_item.associated_filename
         filename = u"-".join(filename.split('-')[:-1])  # remove date
diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index 48d7c4a4f..5ece22073 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -467,10 +467,8 @@ administrativact_register_wizard = SearchWizard.as_view([
 
 
 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)):
+    if not request.user.has_perm('view_administrativeact',
+                                 models.AdministrativeAct):
         return HttpResponse(content_type='text/plain')
     try:
         act_file = models.AdministrativeAct.objects.get(pk=pk)