diff --git a/club/templates/club/club_list.jinja b/club/templates/club/club_list.jinja index 4c880558..fe6ee701 100644 --- a/club/templates/club/club_list.jinja +++ b/club/templates/club/club_list.jinja @@ -17,7 +17,7 @@ {%- endmacro %} {% block content %} - {% if user.is_superuser or user.is_in_group(settings.SITH_GROUPS['root']['name']) %} + {% if user.is_root %}

{% trans %}New club{% endtrans %}

{% endif %} {% if club_list %} diff --git a/core/models.py b/core/models.py index 00cc44d1..62c3a3d5 100644 --- a/core/models.py +++ b/core/models.py @@ -223,6 +223,7 @@ class User(AbstractBaseUser): return True return self.groups.filter(name=group_name).exists() + @property def is_root(self): return self.is_superuser or self.groups.filter(name=settings.SITH_GROUPS['root']['name']).exists() @@ -348,7 +349,7 @@ class User(AbstractBaseUser): return False def can_be_edited_by(self, user): - return user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) or user.is_in_group(settings.SITH_GROUPS['root']['name']) + return user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) or user.is_root class AnonymousUser(AuthAnonymousUser): diff --git a/core/templates/core/user_base.jinja b/core/templates/core/user_base.jinja index d6e3a356..26f11720 100644 --- a/core/templates/core/user_base.jinja +++ b/core/templates/core/user_base.jinja @@ -13,7 +13,7 @@ {% endif %} {% if profile.customer and (profile == request.user or request.user.is_in_group(settings.SITH_GROUPS['accounting-admin']['name']) - or request.user.is_in_group(settings.SITH_GROUPS['root']['name'])) %} + or request.user.is_root) %} {% trans %}Account{% endtrans %} {% endif %} diff --git a/core/templates/core/user_tools.jinja b/core/templates/core/user_tools.jinja index 2be117be..57c62800 100644 --- a/core/templates/core/user_tools.jinja +++ b/core/templates/core/user_tools.jinja @@ -10,10 +10,10 @@

{% trans %}Sith management{% endtrans %}

@@ -21,7 +21,7 @@

{% trans %}Counters{% endtrans %}