From 07a7e041cb1f6f924c1c11dbb6da3dcde0b27f1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Thu, 22 Aug 2024 13:22:00 +0200 Subject: [PATCH] fix template errors if mesh not enabled --- src/c3nav/control/models.py | 4 ++++ src/c3nav/control/templates/control/base.html | 4 +++- src/c3nav/site/templates/site/account.html | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/c3nav/control/models.py b/src/c3nav/control/models.py index 35f9418a..7949f17b 100644 --- a/src/c3nav/control/models.py +++ b/src/c3nav/control/models.py @@ -107,6 +107,10 @@ class UserPermissions(models.Model): def can_access_base_mapdata(self): return settings.PUBLIC_BASE_MAPDATA or self.base_mapdata_access + @property + def can_manage_mesh(self): + return settings.ENABLE_MESH or self.mesh_control + get_permissions_for_user_lazy = lazy(UserPermissions.get_for_user, UserPermissions) diff --git a/src/c3nav/control/templates/control/base.html b/src/c3nav/control/templates/control/base.html index f69b507c..7fb9465d 100644 --- a/src/c3nav/control/templates/control/base.html +++ b/src/c3nav/control/templates/control/base.html @@ -24,7 +24,9 @@ {% if request.user_permissions.manage_map_updates %} {% trans 'Map Updates' %} · {% endif %} - {% trans 'Mesh' %} · + {% if request.user_permissions.can_manage_mesh %} + {% trans 'Mesh' %} · + {% endif %} {{ request.user.username }}

diff --git a/src/c3nav/site/templates/site/account.html b/src/c3nav/site/templates/site/account.html index cbcc6aab..cdb5973b 100644 --- a/src/c3nav/site/templates/site/account.html +++ b/src/c3nav/site/templates/site/account.html @@ -24,7 +24,7 @@ {% if request.user_permissions.can_review_reports %} {% trans 'reports' %} {% endif %} - {% if request.user_permissions.mesh_control %} + {% if request.user_permissions.can_manage_mesh %} {% trans 'mesh' %} {% endif %}