Browse Source

group renameing CLIENT -> METASERVICE-CLIENT

ShariX Developer 2 days ago
parent
commit
e03e5ca6be

+ 2 - 2
sharix_admin/forms/auth.py

@@ -35,9 +35,9 @@ class ShariXSignUpForm(BaseForm, UserCreationForm):
         if commit:
             self.ldap_ops.add_user(user)
             # self.ldap_ops.set_password(user.username, user.password)
-            self.ldap_ops.add_to_group(user.username, "CLIENT")
+            self.ldap_ops.add_to_group(user.username, "METASERVICE-CLIENT")
             user.save()
-            # user.groups.add(Group.objects.get(id=51))  # Добавляем всех пользователей по умолчанию в группу CLIENT
+            # user.groups.add(Group.objects.get(id=51))  # Добавляем всех пользователей по умолчанию в группу METASERVICE-CLIENT
         return user
 
     class Meta:

+ 1 - 1
sharix_admin/lib/menu.py

@@ -60,7 +60,7 @@ CLIENT_MY_MENU_OPEN = ['orders']
 
 STAFF_METASERVICE_ROLES = ['METASERVICE-ADMIN', 'METASERVICE-SUPERVISOR', 'METASERVICE-SUPPORT', 'METASERVICE-TECHSUPPORT']
 STAFF_PARTNER_ROLES = ['PARTNER-ADMIN', 'PARTNER-SUPERVISOR', 'PARTNER-SUPPORT', 'PARTNER-TECHSUPPORT', 'PROVIDER']
-CLIENT_ROLES = ['CLIENT']
+CLIENT_ROLES = ['METASERVICE-CLIENT']
 
 #if user role in list provided and page name in a connected list then menu item is visible
 #so we have to know user_id and page type and MENU_ALG algorythm

+ 2 - 2
sharix_admin/templates/sharix_admin/main.html

@@ -8,7 +8,7 @@
     <a href="#" class="text-nowrap">Личный кабинет ShariX Platform</a>
 </p>
 
-{% if "CLIENT" in user_groups %}
+{% if "METASERVICE-CLIENT" in user_groups %}
     <div class="card mb-5">
         <div class="card-body d-flex justify-content-between align-items-center">
             <span>Баланс: 0 <i class="fa-solid fa-coins me-1"></i></span>
@@ -57,7 +57,7 @@
                 <li><a href="https://wiki.sharix-app.org/doku.php/sharix/legal/porjadok_okazanija_uslug">Пользовательское соглашение с партнерами</a></li>
             {% endif %}
 
-            {% if "CLIENT" in user_groups %}
+            {% if "METASERVICE-CLIENT" in user_groups %}
                 <li><a href="https://wiki.sharix-app.org/doku.php/sharix/legal/porjadok_okazanija_uslug">Договор на оказание услуг</a></li>
             {% endif %}
 

+ 1 - 1
sharix_admin/templates/sharix_admin/orders.html

@@ -29,7 +29,7 @@
       </form>
       </div>
 
-{% if "CLIENT" in user_groups %}
+{% if "METASERVICE-CLIENT" in user_groups %}
 <h1></h1>
   <div class="container text-end mt-2">
           <a class="btn btn-primary" id="bord" href={% url "sharix_admin:order/add/" %}>{% trans 'Add' %}</a>

+ 3 - 3
sharix_admin/views/order.py

@@ -81,7 +81,7 @@ class OrderEditView(BaseView, FormView):
     page_name = 'order_edit'
 
     def test_func(self):
-        return "CLIENT" in self.user_groups
+        return "METASERVICE-CLIENT" in self.user_groups
 
     def form_valid(self, form):
         with transaction.atomic():
@@ -109,8 +109,8 @@ class OrderCreateView(BaseView, FormView):
     page_name = 'order/add/'
 
     def test_func(self):
-        return "CLIENT" in self.user_groups
-        #return not "CLIENT" in self.user_groups
+        return "METASERVICE-CLIENT" in self.user_groups
+        #return not "METASERVICE-CLIENT" in self.user_groups
 
     def form_valid(self, form):
         with transaction.atomic():