From 8df2b66b7aefa60ac285dd2458550d9a40fd6ed7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9A=D1=83=D0=BB=D0=B0=D0=BA=D0=BE=D0=B2=20=D0=AE=D1=80?=
 =?UTF-8?q?=D0=B8=D0=B9?= <yuriy.kulakov.123@gmail.com>
Date: Thu, 25 Feb 2021 21:57:04 +0300
Subject: [PATCH] Added engineers and light_agents count from organization to
 control page

---
 main/extra_func.py                     |  4 ++--
 main/templates/pages/adm_ruleset.html  |  8 ++------
 main/templates/registration/login.html | 11 +++++------
 main/views.py                          |  8 +++-----
 4 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/main/extra_func.py b/main/extra_func.py
index b408e8d..20c3712 100644
--- a/main/extra_func.py
+++ b/main/extra_func.py
@@ -134,8 +134,8 @@ def make_light_agent(user_profile):
 def get_users_list():
     zendesk = ZendeskAdmin()
     admin = zendesk.get_user(zendesk.email)
-    group = next(zendesk.admin.users.groups(user=admin))  # TODO: user can be in many groups
-    return zendesk.admin.groups.users(group)  # TODO: add role parameter
+    org = next(zendesk.admin.users.organizations(user=admin))
+    return zendesk.admin.organizations.users(org)
 
 
 def update_profile(user_profile: UserProfile):
diff --git a/main/templates/pages/adm_ruleset.html b/main/templates/pages/adm_ruleset.html
index 3366a43..1bddc5f 100644
--- a/main/templates/pages/adm_ruleset.html
+++ b/main/templates/pages/adm_ruleset.html
@@ -2,13 +2,9 @@
 
 {% load static %}
 
-{% block title %}
-Управление
-{%endblock %}
+{% block title %}Управление{%endblock %}
 
-{% block heading %}
-Управление
-{% endblock %}
+{% block heading %}Управление{% endblock %}
 
 {% block extra_css %}
 <link rel="stylesheet" href="{% static 'main/css/work.css' %}"/>
diff --git a/main/templates/registration/login.html b/main/templates/registration/login.html
index 9bb5175..7a3ab68 100644
--- a/main/templates/registration/login.html
+++ b/main/templates/registration/login.html
@@ -1,10 +1,9 @@
 {% extends 'base/base.html' %}
-{% block title %}
-  Авторизация
-{% endblock %}
-{% block heading %}
-  Авторизация
-{% endblock %}
+
+{% block title %}Авторизация{% endblock %}
+
+{% block heading %}Авторизация{% endblock %}
+
 {% block content %}
   <div class="container">
     <div class="card mx-auto" style="width: 40rem">
diff --git a/main/views.py b/main/views.py
index b5d02f1..72d4e52 100644
--- a/main/views.py
+++ b/main/views.py
@@ -114,13 +114,11 @@ class AdminPageView(FormView, LoginRequiredMixin):
 
     @staticmethod
     def make_engineers(users):
-        for user in users:
-            make_engineer(user)
+        [make_engineer(user) for user in users]
 
     @staticmethod
     def make_light_agents(users):
-        for user in users:
-            make_light_agent(user)
+        [make_light_agent(user) for user in users]
 
     @staticmethod
     def count_users(users):  # TODO: this func counts users from all zendesk instead of just from a model
@@ -132,7 +130,7 @@ class AdminPageView(FormView, LoginRequiredMixin):
                 light_agents += 1
         return engineers, light_agents
 
-    def get_context_data(self, **kwargs):  # TODO: add engineers and agents count
+    def get_context_data(self, **kwargs):
         if self.request.user.userprofile.role != 'admin':
             raise PermissionDenied
         context = super().get_context_data(**kwargs)