Sheet operation QA: add context record

2 files changed, 21 insertions, 3 deletions

diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py
index b15dbf580..a0d0ba30b 100644
--- a/archaeological_operations/models.py
+++ b/archaeological_operations/models.py
@@ -1064,6 +1064,22 @@ class Operation(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
             finds__base_finds__context_record__operation=self
         )
 
+    def get_extra_actions(self, request):
+        """
+        For sheet template
+        """
+        # url, base_text, icon, extra_text, extra css class, is a quick action
+
+        can_add_cr = self.can_do(request, 'add_contextrecord')
+        actions = []
+        if can_add_cr:
+            actions += [
+                (reverse('operation-qa-contextrecord', args=[self.pk]),
+                 _(u"Add context record"), "fa fa-plus",
+                 _(u"context record"), "", True),
+            ]
+        return actions
+
     associated_file_short_label_lbl = _(u"Archaeological file")
     full_code_patriarche_lbl = _(u"Code patriarche")
 
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index fb938b93f..1d699cbed 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -196,10 +196,12 @@
 {% dynamic_table_document archaeologicalsites_label 'sites' 'operations' item.pk '' output %}
 {% endif %}
 
+{% if item.grouped_parcels %}
 {% trans "Associated parcels" as parcels_label %}
 {% include "ishtar/blocks/window_tables/parcels.html" %}
+{% endif %}
 
-{% if item.administrative_act %}
+{% if item.administrative_act.count %}
 <h3>{% trans "Administrative acts" %}</h3>
 {% table_administrativact "" item.administrative_act.all %}
 {% endif %}
@@ -209,7 +211,7 @@
 {% dynamic_table_document operation_docs 'documents' 'operations' item.pk '' output %}
 {% endif %}
 
-{% if view_own_contextrecord or view_contextrecord %}
+{% if permission_view_own_contextrecord or permission_view_contextrecord %}
 {% if item.context_record.count %}
 {% trans "Context records" as cr_lab %}
 {% dynamic_table_document cr_lab 'context_records_for_ope' 'operation_id' item.pk 'TABLE_COLS_FOR_OPE' output %}
@@ -236,7 +238,7 @@
 {% dynamic_table_document finds_docs 'documents' 'finds__base_finds__context_record__operation' item.pk '' output %}
 {% endif %}
 
-{% if view_own_container or view_container %}
+{% if permission_view_own_container or permission_view_container %}
 {% if item.containers_q.count %}
 {% trans "Associated containers" as containers_lbl %}
 {% dynamic_table_document containers_lbl 'containers' 'finds__base_finds__context_record__operation' item.pk '' output %}