From baf02cca44ac2dc6041a8561de50df8d904ff021 Mon Sep 17 00:00:00 2001 From: Yuriy Kulakov Date: Tue, 23 Feb 2021 19:46:43 +0300 Subject: [PATCH] Added user list function --- access_controller/settings.py | 4 +-- main/extra_func.py | 7 +++++ main/templates/pages/adm_ruleset.html | 41 ++++++++++++--------------- main/views.py | 17 +++++++++-- 4 files changed, 41 insertions(+), 28 deletions(-) diff --git a/access_controller/settings.py b/access_controller/settings.py index 4c25e78..4112bab 100644 --- a/access_controller/settings.py +++ b/access_controller/settings.py @@ -129,6 +129,6 @@ LOGIN_REDIRECT_URL = '/' LOGOUT_REDIRECT_URL = '/' ZENDESK_ROLES = { - 'engineer': '360005209000', - 'light_agent': '360005208980', + 'engineer': 360005209000, + 'light_agent': 360005208980, } diff --git a/main/extra_func.py b/main/extra_func.py index 26dffa5..4cfd45b 100644 --- a/main/extra_func.py +++ b/main/extra_func.py @@ -127,6 +127,13 @@ def make_light_agent(user_profile): zendesk.admin.users.update(user) +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 + + def update_profile(user_profile: UserProfile): """ Функция обновляет профиль пользователя в соотвтетствии с текущим в Zendesk diff --git a/main/templates/pages/adm_ruleset.html b/main/templates/pages/adm_ruleset.html index 460d8d2..e025c27 100644 --- a/main/templates/pages/adm_ruleset.html +++ b/main/templates/pages/adm_ruleset.html @@ -27,30 +27,26 @@ {{ field.tag }} {% endfor %} -
-
-
-
Список сотрудников
- - - - - - + + + + + + - {% for user in users %} - - - - - - - - {% endfor %} + {% for user in users %} + + + + + + + + {% endfor %}
IDEmailRoleName(link to profile)Checked
IDEmailRoleName(link to profile)Checked
{{ user.id }}{{ user.user.email }}{{ user.role }}{{ user.name }}
{{ user.id }}{{ user.user.email }}{{ user.role }}{{ user.name }}
@@ -62,20 +58,20 @@
Инженеров:
- 13 + {{ engineers }}
Легких агентов:
- 22 + {{ light_agents }}
-