From e1474c7a744a1925fdc6b20ff38396b6b00276c1 Mon Sep 17 00:00:00 2001
From: Skia <skia@libskia.so>
Date: Sun, 14 Aug 2016 04:35:08 +0200
Subject: [PATCH] Add is_root property to user

---
 club/templates/club/club_list.jinja  | 2 +-
 core/models.py                       | 3 ++-
 core/templates/core/user_base.jinja  | 2 +-
 core/templates/core/user_tools.jinja | 8 ++++----
 core/views/user.py                   | 4 ++--
 subscription/models.py               | 2 +-
 6 files changed, 11 insertions(+), 10 deletions(-)

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 %}
     <p><a href="{{ url('club:club_new') }}">{% trans %}New club{% endtrans %}</a></p>
     {% 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) %}
         <a href="{{ url('core:user_account', user_id=profile.id) }}">{% trans %}Account{% endtrans %}</a>
         {% endif %}
     </div>
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 @@
 <hr>
 <h4>{% trans %}Sith management{% endtrans %}</h4>
 <ul>
-    {% if user.is_in_group(settings.SITH_GROUPS['root']['name']) %}
+    {% if user.is_root %}
     <li><a href="{{ url('core:group_list') }}">{% trans %}Groups{% endtrans %}</a></li>
     {% endif %}
-    {% if user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) or user.is_in_group(settings.SITH_GROUPS['root']['name']) %}
+    {% if user.is_in_group(settings.SITH_MAIN_BOARD_GROUP) or user.is_root %}
     <li><a href="{{ url('subscription:subscription') }}">{% trans %}Subscriptions{% endtrans %}</a></li>
     {% endif %}
 </ul>
@@ -21,7 +21,7 @@
 <hr>
 <h4>{% trans %}Counters{% endtrans %}</h4>
 <ul>
-    {% if user.is_in_group(settings.SITH_GROUPS['counter-admin']['name']) or user.is_in_group(settings.SITH_GROUPS['root']['name']) %}
+    {% if user.is_in_group(settings.SITH_GROUPS['counter-admin']['name']) or user.is_root %}
     <h5>{% trans %}General management{% endtrans %}</h5>
     <li><a href="{{ url('counter:admin_list') }}">{% trans %}General counters management{% endtrans %}</a></li>
     <li><a href="{{ url('counter:product_list') }}">{% trans %}Products management{% endtrans %}</a></li>
@@ -38,7 +38,7 @@
 <hr>
 <h4>{% trans %}Accounting{% endtrans %}</h4>
 <ul>
-    {% if user.is_in_group(settings.SITH_GROUPS['accounting-admin']['name']) or user.is_in_group(settings.SITH_GROUPS['root']['name']) %}
+    {% if user.is_in_group(settings.SITH_GROUPS['accounting-admin']['name']) or user.is_root %}
     <li><a href="{{ url('accounting:bank_list') }}">{% trans %}General accounting{% endtrans %}</a></li>
     {% endif %}
     {% for m in user.membership.filter(end_date=None).filter(role__gte=7).all() %}
diff --git a/core/views/user.py b/core/views/user.py
index 7bdff87c..3bff6535 100644
--- a/core/views/user.py
+++ b/core/views/user.py
@@ -46,7 +46,7 @@ def password_root_change(request, user_id):
     """
     Allows a root user to change someone's password
     """
-    if not request.user.is_superuser and not request.user.is_in_group(settings.SITH_GROUPS['root']['name']):
+    if not request.user.is_root:
         raise PermissionDenied
     user = User.objects.filter(id=user_id).first()
     if not user:
@@ -196,7 +196,7 @@ class UserAccountView(DetailView):
         res = super(UserAccountView, self).dispatch(request, *arg, **kwargs)
         if (self.object == 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):
             return res
         raise PermissionDenied
 
diff --git a/subscription/models.py b/subscription/models.py
index 1c46ec2a..034dae81 100644
--- a/subscription/models.py
+++ b/subscription/models.py
@@ -115,7 +115,7 @@ class Subscription(models.Model):
 
 
     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
 
     def is_valid_now(self):
         return self.subscription_start <= date.today() and date.today() <= self.subscription_end