diff --git a/main/views.py b/main/views.py index 5d362d7..c1e7794 100644 --- a/main/views.py +++ b/main/views.py @@ -1,4 +1,3 @@ - from django.shortcuts import render, redirect, reverse from django.http import HttpResponseRedirect @@ -17,7 +16,6 @@ from django_registration.views import RegistrationView from django.contrib.auth.decorators import login_required import logging - from zenpy import Zenpy from zenpy.lib.api_objects import User as ZenpyUser @@ -26,7 +24,6 @@ from .models import UserProfile import os - class CustomRegistrationView(RegistrationView): """ Отображение и логика работы страницы регистрации пользователя @@ -96,6 +93,7 @@ def profile_page(request): } return render(request, 'pages/profile.html', context) + def auth_user(request): admin_creds = { 'email': os.environ.get('ACCESS_CONTROLLER_API_EMAIL'), @@ -106,11 +104,12 @@ def auth_user(request): zenpy_user: ZenpyUser = admin.users.search(request.user.email).values[0] return zenpy_user, admin + @login_required() def work_page(request, id): if request.user.is_authenticated and request.user.id == id: zenpy_user, _ = auth_user(request) - + context = { 'engineers': UserProfile.objects.filter(role=1), 'agents': UserProfile.objects.filter(role=0), @@ -120,26 +119,27 @@ def work_page(request, id): return render(request, 'pages/work.html', context) return redirect("login") + @login_required() def work_hand_over(request): zenpy_user, admin = auth_user(request) - if request.user.is_authenticated and zenpy_user.role == "admin": + if zenpy_user.role == "admin": zenpy_user.role = "agent" admin.users.update(zenpy_user) request.user.userprofile.role = 0 request.user.userprofile.save() - return HttpResponseRedirect(reverse('work', args=(request.user.id, ))) + return HttpResponseRedirect(reverse('work', args=(request.user.id,))) @login_required() def work_become_engineer(request): zenpy_user, admin = auth_user(request) - if request.user.is_authenticated and zenpy_user.role == "agent": + if zenpy_user.role == "agent": zenpy_user.role = "admin" admin.users.update(zenpy_user) request.user.userprofile.role = 1 request.user.userprofile.save() - return HttpResponseRedirect(reverse('work', args=(request.user.id, ))) + return HttpResponseRedirect(reverse('work', args=(request.user.id,))) def main_page(request):