diff --git a/README.md b/README.md index eb66f37..8489e7d 100644 --- a/README.md +++ b/README.md @@ -48,9 +48,9 @@ cp .env.example .env sudo apt install make pip install --upgrade pip pip install -r requirements/dev.txt -(set -a && source .env && ./manage.py migrate) -(set -a && source .env && ./manage.py loaddata data.json) -(set -a && source .env && ./manage.py runserver) +./manage.py migrate +./manage.py loaddata data.json +./manage.py runserver ``` ## Перед запуском для тестирования: @@ -65,7 +65,7 @@ pip install -r requirements/dev.txt - Перейти в папку приложения - Активировать виртуальное окружение - Выполнить команду `pip install -r requirements/dev.txt` -- В виртуальное окружение добавить следующие переменные: +- В файл `.env` добавить следующие переменные: ``` diff --git a/access_controller/settings.py b/access_controller/settings.py index a74ad7f..7361a60 100644 --- a/access_controller/settings.py +++ b/access_controller/settings.py @@ -11,6 +11,7 @@ https://docs.djangoproject.com/en/3.1/ref/settings/ """ import os from pathlib import Path +from dotenv import load_dotenv # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent @@ -18,6 +19,9 @@ BASE_DIR = Path(__file__).resolve().parent.parent # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/ +# Load environment variables from .env +load_dotenv() + # SECURITY WARNING: keep the secret key used in production secret! SECRET_KEY = os.getenv('ACTRL_SECRET_KEY', 'empty') diff --git a/fixtures/profile.json b/fixtures/profile.json new file mode 100644 index 0000000..8ce02db --- /dev/null +++ b/fixtures/profile.json @@ -0,0 +1,59 @@ +[ + { + "model": "auth.user", + "pk": 1, + "fields": { + "password": "pbkdf2_sha256$216000$gHBBCr1jBELf$ZkEDW3IEd8Wij7u8vkv+0Eze32CS01bcaYWhcD9OIC4=", + "last_login": null, + "is_superuser": true, + "username": "idar.sokurov.05@mail.ru", + "first_name": "", + "last_name": "", + "email": "idar.sokurov.05@mail.ru", + "is_staff": true, + "is_active": true, + "date_joined": "2021-03-10T16:38:56.303Z", + "groups": [], + "user_permissions": [ + 33 + ] + } + }, + { + "model": "main.userprofile", + "pk": 1, + "fields": { + "name": "ZendeskAdmin", + "user": 1, + "role": "admin" + } + }, + { + "model": "auth.user", + "pk": 2, + "fields": { + "password": "pbkdf2_sha256$216000$5qLJgrm2Quq9$KDBNNymVZXkUx0HKBPFst2m83kLe0egPBnkW7KnkORU=", + "last_login": null, + "is_superuser": false, + "username": "krav-88@mail.ru", + "first_name": "", + "last_name": "", + "email": "krav-88@mail.ru", + "is_staff": false, + "is_active": true, + "date_joined": "2021-03-10T16:38:56.303Z", + "groups": [], + "user_permissions": [] + } + }, + { + "model": "main.userprofile", + "pk": 2, + "fields": { + "name": "UserForAccessTest", + "user": 2, + "role": "agent", + "custom_role_id": "360005209000" + } + } +] diff --git a/main/extra_func.py b/main/extra_func.py index e6a2a97..90ec414 100644 --- a/main/extra_func.py +++ b/main/extra_func.py @@ -6,8 +6,8 @@ from django.core.exceptions import ObjectDoesNotExist from django.shortcuts import redirect from django.utils import timezone from zenpy import Zenpy -from zenpy.lib.exception import APIException from zenpy.lib.api_objects import User as ZenpyUser, Ticket as ZenpyTicket +from zenpy.lib.exception import APIException from zenpy.lib.generator import SearchResultGenerator from access_controller.settings import ZENDESK_ROLES as ROLES, ACTRL_ZENDESK_SUBDOMAIN diff --git a/main/forms.py b/main/forms.py index 81b2e8a..8ca6f13 100644 --- a/main/forms.py +++ b/main/forms.py @@ -140,3 +140,23 @@ class StatisticForm(forms.Form): } ), ) + + +class WorkGetTicketsForm(forms.Form): + """ + Форма получения количества тикетов для страницы work и work_get_tickets. + + :param count_tickets: Поле для ввода количества тикетов + :type count_tickets: :class:`django.forms.fields.IntegerField` + """ + count_tickets = forms.IntegerField( + min_value=0, + max_value=100, + required=True, + widget=forms.NumberInput( + attrs={ + 'class': 'form-control mb-3', + 'value': 1 + } + ), + ) diff --git a/main/templates/base/menu.html b/main/templates/base/menu.html index ef5df18..17c5f81 100644 --- a/main/templates/base/menu.html +++ b/main/templates/base/menu.html @@ -3,56 +3,62 @@ -