CaZzzer/access-controller
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Iurii Tatishchev 2021-05-29 23:23:49 -07:00
commit 977f1858a7
Signed by: CaZzzer
GPG Key ID: 926BE949E29DCD03
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/templates/base/menu.html
View File

@ -40,7 +40,7 @@
{% else %} {% else %}
class="btn btn-secondary" class="btn btn-secondary"
{% endif %} {% endif %}
href="{{ work_url }}">Запрос прав</a> href="{{ work_url }}">Мои Права</a>
{% endif %} {% endif %}
<a class="btn btn-secondary" href="{% url 'logout' %}">Выйти</a> <a class="btn btn-secondary" href="{% url 'logout' %}">Выйти</a>
{% else %} {% else %}

2
main/templates/pages/statistic.html
View File

@ -4,7 +4,7 @@
{% block title %}{{ pagename }}{% endblock %} {% block title %}{{ pagename }}{% endblock %}
{% block heading %} Страницы просмотра статистики{% endblock %} {% block heading %} Статистика {% endblock %}
{% block content%} {% block content%}
<div class="mt-5 py-4"> <div class="mt-5 py-4">

2
main/templates/pages/work.html
View File

@ -4,7 +4,7 @@
{% block title %}{{ pagename }}{% endblock %} {% block title %}{{ pagename }}{% endblock %}
{% block heading %}Управление правами{% endblock %} {% block heading %}Мои Права{% endblock %}
{% block extra_css %} {% block extra_css %}
<link rel="stylesheet" href="{% static 'main/css/work.css' %}" xmlns="http://www.w3.org/1999/html"> <link rel="stylesheet" href="{% static 'main/css/work.css' %}" xmlns="http://www.w3.org/1999/html">

4
main/views.py
View File

@ -203,7 +203,7 @@ def work_page(request: WSGIRequest, required_id: int) -> HttpResponse:
'agents': light_agents, 'agents': light_agents,
'messages': messages.get_messages(request), 'messages': messages.get_messages(request),
'licences_remaining': max(0, ZENDESK_MAX_AGENTS - len(engineers)), 'licences_remaining': max(0, ZENDESK_MAX_AGENTS - len(engineers)),
'pagename': 'Управление правами', 'pagename': 'Мои Права',
'get_tickets_form': WorkGetTicketsForm() 'get_tickets_form': WorkGetTicketsForm()
} }
return render(request, 'pages/work.html', context) return render(request, 'pages/work.html', context)
@ -416,7 +416,7 @@ def statistic_page(request: WSGIRequest) -> HttpResponse:
if not request.user.has_perm("main.has_control_access"): if not request.user.has_perm("main.has_control_access"):
return redirect('index') return redirect('index')
context = { context = {
'pagename': 'страница статистики', 'pagename': 'Статистика',
'errors': list(), 'errors': list(),
} }
if request.method == "POST": if request.method == "POST":