Profile: do not display geo item list when mapping is deactivated (refs #4467)

2 files changed, 5 insertions, 5 deletions

diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index bfdda4bfe..3ff8f9d3f 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -1114,7 +1114,8 @@ class ContextRecord(
         actions = super(ContextRecord, self).get_extra_actions(request)
 
         # is_locked = hasattr(self, "is_locked") and self.is_locked(request.user)
-        can_add_geo = self.can_do(request, "add_geovectordata")
+        profile = get_current_profile()
+        can_add_geo = profile.mapping and self.can_do(request, "add_geovectordata")
         if can_add_geo:
             actions.append(self.get_add_geo_action())
         can_create_find = self.can_do(request, "add_find")
diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
index d82766305..79f58b94d 100644
--- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
+++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html
@@ -30,7 +30,6 @@
 {% with has_finds=item|safe_or:"base_finds.count" %}
 {% with display_finds=has_finds|and_:can_view_finds %}
 {% with display_data=item.data %}
-{% with display_geo=item.geodata.count %}
 
 {% if output != "ODT" and output != "PDF"%}
 <ul class="nav nav-tabs" id="{{window_id}}-tabs" role="tablist">
@@ -93,7 +92,7 @@
         </a>
     </li>
     {% endif %}
-    {% if not is_external and display_geo %}
+    {% if not is_external and SHOW_GEO %}
     <li class="nav-item">
         <a class="nav-link" id="{{window_id}}-geodata-tab"
            data-toggle="tab" href="#{{window_id}}-geodata" role="tab"
@@ -332,7 +331,7 @@
     </div>
     {% endif %}
 
-    {% if not is_external and display_geo %}
+    {% if not is_external and SHOW_GEO %}
     <div class="tab-pane fade" id="{{window_id}}-geodata"
          role="tabpanel" aria-labelledby="{{window_id}}-geodata-tab">
         {% with geo_item=item %}{% include "ishtar/blocks/sheet_geographic.html" %}{% endwith %}
@@ -347,6 +346,6 @@
     {% endif %}
 </div>
 
-{% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %}
+{% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %}
 
 {% endblock %}