Огромная замена логики

templates/base.html

@@ -17,6 +17,14 @@
     {% endif %}
 
     <main class="container-fluid py-3 flex-grow-1 d-flex flex-column">
+        {% if messages %}
+            <div class="mb-3">
+                {% for message in messages %}
+                    <div class="alert {% if message.tags %}alert-{{ message.tags }}{% else %}alert-secondary{% endif %} mb-2" role="alert">{{ message }}</div>
+                {% endfor %}
+            </div>
+        {% endif %}
+
         {% block content %}{% endblock %}
     </main>
 

templates/components/_navbar.html

@@ -15,22 +15,24 @@
                     <a class="nav-link {% if request.resolver_match.url_name == 'registry' %}active{% endif %}" href="{% url 'registry' %}">Реестр</a>
                 </li>
                 
-                {% if user_role in 'admin,technologist,master,clerk' %}
+                {% if user_role in 'admin,technologist,master,clerk,observer' %}
                 <li class="nav-item">
                     <a class="nav-link {% if request.resolver_match.url_name == 'planning' or request.resolver_match.url_name == 'planning_deal' %}active{% endif %}" href="{% url 'planning' %}">Сделки</a>
                 </li>
                 <li class="nav-item">
                     <a class="nav-link {% if request.resolver_match.url_name == 'customers' or request.resolver_match.url_name == 'customer_deals' %}active{% endif %}" href="{% url 'customers' %}">Заказчик</a>
                 </li>
+                <li class="nav-item">
+                    <a class="nav-link {% if request.resolver_match.url_name == 'warehouse_stocks' %}active{% endif %}" href="{% url 'warehouse_stocks' %}">Склады</a>
+                </li>
                 {% endif %}
 
-                {% if user_role in 'admin,technologist,master,operator' %}
-                <li class="nav-item"><a class="nav-link" href="#">Закрытие</a></li>
+                {% if user_role in 'admin,master,operator,observer' %}
+                <li class="nav-item">
+                    <a class="nav-link {% if request.resolver_match.url_name == 'closing' %}active{% endif %}" href="{% url 'closing' %}">Закрытие</a>
+                </li>
                 {% endif %}
 
-                {% if user_role in 'admin,technologist,clerk' %}
-                <li class="nav-item"><a class="nav-link" href="#">Списание</a></li>
-                {% endif %}
 
                 {% if user_role == 'admin' %}
                 <li class="nav-item">