Merge branch 'develop' into feature/react_test

# Conflicts:
#	main/templates/pages/adm_ruleset.html
#	static/main/js/control.js
This commit is contained in:
Andrew Smirnov
2021-05-13 20:02:27 +03:00
16 changed files with 1029 additions and 334 deletions

View File

@@ -66,10 +66,11 @@
<a href="/work/hand_over" class="hand-over-acess-button default-button">Сдать права инженера</a>
</div>
<div class="col-10">
<form method="GET" action="/work/get_tickets">
<input class="form-control mb-3" type="number" min="1" value="1" name="count_tickets">
<button type="submit" class="default-button">Взять тикеты в работу</button>
</form>
<form method="post" action="{% url 'work_get_tickets' %}">
{% csrf_token %}
{{ get_tickets_form.count_tickets }}
<button type="submit" class="default-button">Взять тикеты в работу</button>
</form>
</div>
{% for message in messages %}
<script>create_notification('{{message}}','','{{message.tags}}',2000)</script>