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

2 files changed, 6 insertions, 7 deletions

diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index 8d0b717a3..43148d7e4 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -35,7 +35,6 @@
 {% with perm_find=permission_view_own_find|or_:permission_view_find %}
 {% with has_finds=item|safe_or:"has_finds" %}
 {% with display_finds=perm_find|and_:has_finds %}
-{% with display_geo=item.geodata.count %}
 
 {% if output != "ODT" and output != "PDF" %}
 <ul class="nav nav-tabs" id="{{window_id}}-tabs" role="tablist">
@@ -91,7 +90,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"
@@ -449,7 +448,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 %}
@@ -608,6 +607,6 @@ $(document).ready( function () {
 } );
 </script>
 
-{% 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 %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %}
 
 {% endblock %}
\ No newline at end of file
diff --git a/archaeological_operations/templates/ishtar/sheet_site.html b/archaeological_operations/templates/ishtar/sheet_site.html
index 9c78a7ffb..d8d5549b6 100644
--- a/archaeological_operations/templates/ishtar/sheet_site.html
+++ b/archaeological_operations/templates/ishtar/sheet_site.html
@@ -12,7 +12,6 @@
 {% with permission_change_geovectordata=permission_change_geovectordata %}
 
 {% with permission_change_geo=permission_change_own_geovectordata|or_:permission_change_geovectordata %}
-{% with display_geo=item.geodata.count %}
 
 <div class="row">
     <div class="offset-lg-4 col-lg-4 offset-md-3 col-md-6 offset-sm-1 col-sm-10 col-12">
@@ -101,9 +100,10 @@
 {% endif %}
 {% endif %}
 
-{% if not is_external and display_geo %}
+{% if not is_external and SHOW_GEO %}
+<h3>{% trans "Geographic data" %}</h3>
 {% with geo_item=item %}{% include "ishtar/blocks/sheet_geographic.html" %}{% endwith %}
 {% endif %}
 
-{% endwith %} {% endwith %} {% endwith %} {% endwith %}
+{% endwith %} {% endwith %} {% endwith %}
 {% endblock %}