Small codestyle fixes

main/extra_func.py

@@ -120,18 +120,19 @@ class ZendeskAdmin:
         return user
 
 
-def make_engineer(user_profile):
+def update_role(user_profile, role):
     zendesk = ZendeskAdmin()
     user = zendesk.get_user(user_profile.user.email)
-    user.custom_role_id = ROLES['engineer']
+    user.custom_role_id = role
     zendesk.admin.users.update(user)
 
 
+def make_engineer(user_profile):
+    update_role(user_profile, ROLES['engineer'])
+
+
 def make_light_agent(user_profile):
-    zendesk = ZendeskAdmin()
+    update_role(user_profile, ROLES['light_agent'])
-    user = zendesk.get_user(user_profile.user.email)
-    user.custom_role_id = ROLES['light_agent']
-    zendesk.admin.users.update(user)
 
 
 def get_users_list():
@@ -167,7 +168,7 @@ def check_user_exist(email: str) -> bool:
     return ZendeskAdmin().check_user(email)
 
 
-def get_user_organization(email: str) -> bool:
+def get_user_organization(email: str) -> str:
     """
     Функция возвращает организацию пользователя
 

main/templates/pages/adm_ruleset.html

@@ -17,19 +17,24 @@
 {% block content %}
 <div class="container-md">
   <div class="new-section">
-    <p class="row page-description">Основаная информация о странице</p>
+    <p class="row page-description">Основная информация о странице</p>
   </div>
+
   <form method="post">
     {% csrf_token %}
+
     <div class="row justify-content-center new-section">
+
       <div style="display: none">
         {% for field in form.users %}
         {{ field.tag }}
         {% endfor %}
       </div>
+
       <div class="col-10">
         <h6 class="table-title">Список сотрудников</h6>
         <table class="light-table">
+
             <thead>
               <th>ID</th>
               <th>Email</th>
@@ -37,6 +42,7 @@
               <th>Name(link to profile)</th>
               <th>Checked</th>
             </thead>
+
             <tbody>
               {% for user in users %}
               <tr>
@@ -48,12 +54,16 @@
               </tr>
               {% endfor %}
             </tbody>
+
         </table>
+
       </div>
     </div>
+
     <div class="row justify-content-center new-section">
       <div class="col-5">
         <div class="info">
+
           <div class="info-row">
             <div class="info-target">Инженеров:</div>
             <div class="info-quantity">
@@ -61,6 +71,7 @@
               <span class="info-quantity-value">{{ engineers }}</span>
             </div>
           </div>
+
           <div class="info-row">
             <div class="info-target">Легких агентов:</div>
             <div class="info-quantity">
@@ -68,15 +79,20 @@
               <span class="info-quantity-value">{{ light_agents }}</span>
             </div>
           </div>
+
         </div>
       </div>
+
       <div class="col-5">
+
         <button type="submit" name="engineer" class="request-acess-button default-button">
           Назначить выбранных на роль инженера
         </button>
+
         <button type="submit" name="light_agent" class="hand-over-acess-button default-button">
           Назначить выбранных на роль легкого агента
         </button>
+
       </div>
     </div>
   </form>