From b16a39fff95c60711b74ba33977de855d16a1204 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 6 Mar 2023 18:06:01 +0100 Subject: Profile: do not display geo item list when mapping is deactivated (refs #4467) --- archaeological_context_records/models.py | 3 ++- .../templates/ishtar/sheet_contextrecord.html | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'archaeological_context_records') 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"%}