diff options
Diffstat (limited to 'archaeological_warehouse')
-rw-r--r-- | archaeological_warehouse/templates/ishtar/sheet_container.html | 5 | ||||
-rw-r--r-- | archaeological_warehouse/templates/ishtar/sheet_warehouse.html | 7 |
2 files changed, 5 insertions, 7 deletions
diff --git a/archaeological_warehouse/templates/ishtar/sheet_container.html b/archaeological_warehouse/templates/ishtar/sheet_container.html index 4cea9b732..84e46fdf7 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_container.html +++ b/archaeological_warehouse/templates/ishtar/sheet_container.html @@ -15,7 +15,6 @@ {% with has_documents=item.documents.count %} {% with display_documents=can_view_documents|and_:has_documents %} -{% with display_geo=item.geodata.count %} {% with permission_change_own_geovectordata=permission_change_own_geovectordata %} {% with permission_change_geovectordata=permission_change_geovectordata %} {% with permission_change_geo=permission_change_own_geovectordata|or_:permission_change_geovectordata %} @@ -164,7 +163,7 @@ </div> {% endif %} {% endwith %} - {% if PROFILE.locate_warehouses and display_geo %} + {% if PROFILE.locate_warehouses and SHOW_GEO %} <h3>{% trans "Geographic localisation" %}</h3> <div class='row'> {% with geo_item=item %} @@ -321,5 +320,5 @@ $(document).ready( function () { } ); </script> -{% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} +{% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endblock %} diff --git a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html index 10363e403..b74d056a8 100644 --- a/archaeological_warehouse/templates/ishtar/sheet_warehouse.html +++ b/archaeological_warehouse/templates/ishtar/sheet_warehouse.html @@ -11,7 +11,6 @@ {% with has_documents=item.documents.count %} {% with display_documents=can_view_documents|and_:has_documents %} -{% with display_geo=item.geodata.count %} {% with permission_change_own_geovectordata=permission_change_own_geovectordata %} {% with permission_change_geovectordata=permission_change_geovectordata %} {% with permission_change_geo=permission_change_own_geovectordata|or_:permission_change_geovectordata %} @@ -112,9 +111,9 @@ </div> {% include "ishtar/blocks/sheet_json.html" %} - {% if display_geo or item.get_address or item.get_address_complement or item.get_postal_code or item.get_town %} + {% if item.get_address or item.get_address_complement or item.get_postal_code or item.get_town %} <h3>{% trans "Geographic localisation" %}</h3> - {% if PROFILE.locate_warehouses and display_geo %} + {% if PROFILE.locate_warehouses and SHOW_GEO %} <div class='row'> {% with geo_item=item %} {% include "ishtar/blocks/sheet_map.html"%} @@ -277,5 +276,5 @@ $(document).ready( function () { } ); </script> -{% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} +{% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endwith %} {% endblock %} |