Add DOCS_URL to settings, update README and env.example

.env.example

@@ -23,3 +23,4 @@ ACTRL_ZENDESK_SUBDOMAIN="ngenix1612197338"
 ACTRL_API_EMAIL="stepanenko_olga@mail.ru"
 ACTRL_API_TOKEN="X1x4QeNa4xRdul2rTIKhac98AsXMwd5bOGAyZOtU"
 
+ACTRL_DOCS_URL="/docs"

README.md

@@ -107,6 +107,7 @@ ACTRL_EMAIL_HOST_USER={USERNAME} - логин с которым приложен
 ACTRL_EMAIL_HOST_PASSWORD={PASSWORD} - пароль/ключ с которым приложение входит на почтовый сервер
 ACTRL_FROM_EMAIL={EMAIL} - адрес с которого приложение отправляет письма
 ACTRL_SERVER_EMAIL={EMAIL} - адрес на который отвечают пользователя
+ACTRL_DOCS_URL={URL} - URL на котором лежит документация
 
 ACTRL_API_EMAIL={EMAIL} - почта админа в ZenDesk
 ACTRL_API_PASSWORD={PASSWORD} - пароль админа ZenDesk
@@ -136,27 +137,28 @@ SHIFTH={SHIFT_HOURS} - количество часов в рабочей сме
 - Выполнить команду 
 ```bash
 docker run -d -p 8000:8000 \
-  ACTRL_DEBUG={0/1} \
-  ACTRL_HOST={HOSTNAME} \
-  ACTRL_SECRET_KEY={DJANGO_SECRET_KEY} \
-  ACTRL_EMAIL_HOST={SMTP_HOST} \
-  ACTRL_EMAIL_PORT={SMTP_PORT} \
-  ACTRL_EMAIL_TLS={USE_TLS} \
-  ACTRL_EMAIL_HOST_USER={USERNAME} \
-  ACTRL_EMAIL_HOST_PASSWORD={PASSWORD} \
-  ACTRL_FROM_EMAIL={EMAIL} \
-  ACTRL_SERVER_EMAIL={EMAIL} \
-  ACTRL_API_EMAIL={EMAIL} \
-  ACTRL_API_PASSWORD={PASSWORD} \
-  ACTRL_API_TOKEN={API_TOKEN} \
-  ACTRL_ZENDESK_SUBDOMAIN={DOMAIN} \
-  ENG_CROLE_ID={ENGINEER_CUSTOM_ROLE_ID} \
-  LA_CROLE_ID={LIGHT_AGENT_CUSTOM_ROLE_ID} \
-  EMPL_GROUP={EMPLOYEE_GROUP_NAME} \
-  BUF_GROUP={BUFFER_GROUP_NAME} \
-  ST_EMAIL={SOLVED_TICKETS_EMAIL} \
-  LICENSE_NO={LICENSE_NO} \
-  SHIFTH={SHIFT_HOURS} \
+  -e ACTRL_DEBUG={0/1} \
+  -e ACTRL_HOST={HOSTNAME} \
+  -e ACTRL_SECRET_KEY={DJANGO_SECRET_KEY} \
+  -e ACTRL_EMAIL_HOST={SMTP_HOST} \
+  -e ACTRL_EMAIL_PORT={SMTP_PORT} \
+  -e ACTRL_EMAIL_TLS={USE_TLS} \
+  -e ACTRL_EMAIL_HOST_USER={USERNAME} \
+  -e ACTRL_EMAIL_HOST_PASSWORD={PASSWORD} \
+  -e ACTRL_FROM_EMAIL={EMAIL} \
+  -e ACTRL_SERVER_EMAIL={EMAIL} \
+  -e ACTRL_API_EMAIL={EMAIL} \
+  -e ACTRL_API_PASSWORD={PASSWORD} \
+  -e ACTRL_API_TOKEN={API_TOKEN} \
+  -e ACTRL_ZENDESK_SUBDOMAIN={DOMAIN} \
+  -e ENG_CROLE_ID={ENGINEER_CUSTOM_ROLE_ID} \
+  -e LA_CROLE_ID={LIGHT_AGENT_CUSTOM_ROLE_ID} \
+  -e EMPL_GROUP={EMPLOYEE_GROUP_NAME} \
+  -e BUF_GROUP={BUFFER_GROUP_NAME} \
+  -e ST_EMAIL={SOLVED_TICKETS_EMAIL} \
+  -e LICENSE_NO={LICENSE_NO} \
+  -e SHIFTH={SHIFT_HOURS} \
+  -e ACTRL_DOCS_URL={URL} \
   -v {ABSOLUTE_PATH_TO_DB}:/zendesk-access-controller/db \
   access_controller:latest
 ```

access_controller/settings.py

@@ -184,6 +184,8 @@ SOLVED_TICKETS_EMAIL = os.getenv('ST_EMAIL')
 
 ZENDESK_MAX_AGENTS = int(os.getenv('LICENSE_NO', '0'))
 
+ACTRL_DOCS_URL = os.getenv('ACTRL_DOCS_URL', '#')
+
 REST_FRAMEWORK = {
     # Use Django's standard `django.contrib.auth` permissions,
     # or allow read-only access for unauthenticated users.
@@ -202,5 +204,3 @@ ACTRL_API_EMAIL = os.getenv('ACTRL_API_EMAIL') or os.getenv('ACCESS_CONTROLLER_A
 ACTRL_API_TOKEN = os.getenv('ACTRL_API_TOKEN') or os.getenv('ACCESS_CONTROLLER_API_TOKEN')
 ACTRL_API_PASSWORD = os.getenv('ACTRL_API_PASSWORD') or os.getenv('ACCESS_CONTROLLER_API_PASSWORD')
 
-
-DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'

main/templates/base/menu.html

@@ -1,3 +1,4 @@
+{% load settings_value %}
 {% load static %}
 <header>
   <meta charset="utf-8">
@@ -8,8 +9,8 @@
       <img src="{% static 'main/img/logo_real.png' %}" width="107" height="22" class="d-inline-block align-top" style="margin-left: 15px" alt="" loading="lazy">
       <t class="px-2" style="color:#FFFFFF">Access Controller</t>
     </a>
+    <div class="btn-group" role="group" aria-label="Basic example" style="margin-right: 9px">
     {% if request.user.is_authenticated %}
-      <div class="btn-group" role="group" aria-label="Basic example" style="margin-right: 9px">
         {% url 'profile' as profile_url %}
         <a {% if request.path == profile_url %}
             class="btn btn-primary"
@@ -42,11 +43,7 @@
           href="{{ work_url }}">Запрос прав</a>
         {% endif %}
         <a class="btn btn-secondary" href="{% url 'logout' %}">Выйти</a>
-        <a class="btn btn-secondary"
-        href="https://actrl.cazzzer.com/docs/index.html"> Документация</a>
-      </div>
     {% else %}
-      <div class="btn-group" role="group" aria-label="Basic example" style="margin-right: 9px">
         {% url 'login' as login_url %}
         <a {% if request.path == login_url %}
             class="btn btn-primary"
@@ -61,10 +58,10 @@
             class="btn btn-secondary"
           {% endif %}
         href="{{ registration_url }}">Зарегистрироваться</a>
-        {% url 'documentation' as documentation_url %}
-        <a class="btn btn-secondary"
-        href="{{ documentation_url }}">Документация</a>
-      </div>
     {% endif %}
+    <a class="btn btn-secondary"
+      href="{% settings_value 'ACTRL_DOCS_URL' %}"> Документация
+    </a>
+    </div>
   </nav>
 </header>

main/templatetags/settings_value.py

@@ -0,0 +1,9 @@
+from django import template
+from django.conf import settings
+
+register = template.Library()
+
+
+@register.simple_tag
+def settings_value(name):
+    return getattr(settings, name, "")