Merge branch 'develop' of https://gitlab.informatics.ru/2020-2021/online/s101/group-02/access_controller into develop

main/views.py

@@ -1,7 +1,3 @@
-import logging
-import os
-from datetime import datetime
-
 from smtplib import SMTPException
 
 from django.contrib import messages
@@ -13,7 +9,6 @@ from django.contrib.auth.forms import PasswordResetForm
 from django.contrib.auth.views import LoginView
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.messages.views import SuccessMessageMixin
-from django.core.exceptions import PermissionDenied
 from django.core.handlers.wsgi import WSGIRequest
 from django.http import HttpResponseRedirect, HttpResponse
 from django.shortcuts import render, redirect, get_list_or_404
@@ -25,7 +20,7 @@ from rest_framework import viewsets
 from rest_framework.response import Response
 from zenpy.lib.api_objects import User as ZenpyUser
 
-from access_controller.settings import EMAIL_HOST_USER, ZENDESK_ROLES, ZENDESK_MAX_AGENTS, ZENDESK_GROUPS
+from access_controller.settings import DEFAULT_FROM_EMAIL, ZENDESK_ROLES, ZENDESK_MAX_AGENTS
 from main.extra_func import check_user_exist, update_profile, get_user_organization, \
     make_engineer, make_light_agent, get_users_list, update_users_in_model, count_users, \
     StatisticData, log, ZendeskAdmin
@@ -36,7 +31,6 @@ from .models import UserProfile
 
 def setup_context(profile_lit: bool = False, control_lit: bool = False, work_lit: bool = False,
                   registration_lit: bool = False, login_lit: bool = False):
-    print(profile_lit, control_lit, work_lit, registration_lit, login_lit)
     context = {
         'profile_lit': profile_lit,
         'control_lit': control_lit,
@@ -88,7 +82,7 @@ class CustomRegistrationView(RegistrationView):
                 opts = {
                     'use_https': self.request.is_secure(),
                     'token_generator': default_token_generator,
-                    'from_email': EMAIL_HOST_USER,
+                    'from_email': DEFAULT_FROM_EMAIL,
                     'email_template_name': 'registration/password_reset_email.html',
                     'subject_template_name': 'registration/password_reset_subject.txt',
                     'request': self.request,
@@ -205,23 +199,6 @@ def work_page(request: WSGIRequest, id: int) -> HttpResponse:
     return redirect("login")
 
 
-def user_update(zenpy_user: User, admin: User, request: WSGIRequest) -> UserProfile:
-    """
-    Функция устанавливает пользователю роль "agent" (изменяет профиль).
-
-    :param zenpy_user: Пользователь Zendesk
-    :param admin: Пользователь
-    :param request: Запрос установки роли "agent" в Userprofile
-    :return: Обновленный профиль пользователя
-    """
-
-    admin.users.update(zenpy_user)
-    request.user.userprofile.role = "agent"
-    request.user.userprofile.custom_role_id = zenpy_user.custom_role_id
-    request.user.userprofile.save()
-    messages.success(request, "Права были изменены")
-
-
 @login_required()
 def work_hand_over(request: WSGIRequest) -> HttpResponseRedirect:
     """
@@ -348,7 +325,6 @@ class AdminPageView(LoginRequiredMixin, PermissionRequiredMixin, SuccessMessageM
         return context  # TODO: need to get profile page url
 
 
-
 class CustomLoginView(LoginView):
     """
     Отображение страницы авторизации пользователя