fixing merge and updating locale ID translation

sharix_admin/forms/__init__.py

@@ -1,6 +1,7 @@
 from .auth import *
 from .base import BaseForm
 from .company import *
+from .job_request import *
 from .document import *
 from .service import *
 from .resource import *

sharix_admin/locale/ru/LC_MESSAGES/django.po

@@ -47,7 +47,7 @@ msgstr "Успешно, не успешно"
 #: .\tables.py:30 .\tables.py:53 .\tables.py:73 .\tables.py:94 .\tables.py:117
 #: .\tables.py:139 .\tables.py:166
 msgid "ID"
-msgstr "ИД"
+msgstr "№"
 
 #: .\tables.py:31
 msgid "Legal entity"

sharix_admin/templates/sharix_admin/base_admin_menu.html

@@ -255,21 +255,6 @@
         </a>
       </li>
 
-      <li class="nav-item">
-        <a href="{% url 'sharix_admin:provider/add/' %}" class="nav-link {% if current_page == "provider/add/" %}active rounded{% endif %}">
-          <div class="link d-flex align-items-center">
-            <img
-              class="nav-img"
-              src="
-                {% if current_page == "provider/add/" %}
-                  {% static 'sharix_admin/img/menu/briefcase_w.svg' %}
-                {% else %}
-                  {% static 'sharix_admin/img/menu/briefcase.svg' %}
-                {% endif %}">
-            <span class="menu-bar-label">Добавить Исполнителя</span>
-          </div>
-        </a>
-      </li>
       {% endif %}
 
 

sharix_admin/templates/sharix_admin/resource_list.html

@@ -1,8 +1,8 @@
 {% extends 'sharix_admin/base_admin.html' %}
 {% load render_table from django_tables2 %}
 
+{% block view %}
 {% block contenthome %}
-    <h1 >{{ title }}</h1>
 
     <div class="container text-center mt-2">
       {% render_table table %}
@@ -14,7 +14,7 @@
         var resource = $(this).data('resource-id');
         var new_status = $(this).prop('checked') ? 'active' : 'deactivated';
         $.ajax({
-          url: '{% url "resource/change_status" %}',
+          url: '{% url "sharix_admin:resource/change_status" %}',
           type: 'POST',
           data: {
             'resource': resource,
@@ -35,4 +35,5 @@
     
 
     
-{% endblock contenthome %}
+{% endblock contenthome %}
+{% endblock view %}

sharix_admin/urls.py

@@ -47,19 +47,16 @@ urlpatterns = [
     path('resources/', login_required(ResourcesListView.as_view()), name='resources'),
     #path('resource/<str:pk>', login_required(ResourceDetailView.as_view()), name='resource_detail'),
     path('resource/add/', login_required(ResourceCreate.as_view()), name='resource/add/'),
-#    path('resource/edit/<int:pk>', login_required(ResourceEditView.as_view()), name='resource/edit'),
+    path('resource/edit/<int:pk>', login_required(ResourceEditView.as_view()), name='resource/edit'),
 #    path('resource/doc/<str:doc_code>/upload', login_required(ResourceDocUploadView.as_view()),
 #         name='partner_doc_upload'),
 #    path('resource/doc/<str:doc_code>', login_required(ResourceDocView.as_view()), name='resource_doc'),
     path('resource/change_status/', change_resource_status, name='resource/change_status'),
 
+    # Набор страниц по модели Исполнитель
     #path('resource_list/', login_required(ResourceListView.as_view()), name='resource_list'),
     #path('resource_edit/', login_required(ResourceEditView.as_view()), name='resource_edit'),
 
-    # Набор страниц по модели Исполнитель
-    path('resource_list/', login_required(ResourceListView.as_view()), name='resource_list'),
-    path('resource_edit/', login_required(ResourceEditView.as_view()), name='resource_edit'),
-
     path('providers/', login_required(ProvidersListView.as_view()), name='providers'),
     # path('provider/<str:pk>', login_required(ProviderDetailView.as_view()), name='provider_detail'),
     # path('provider/edit/<int:pk>', login_required(ProviderEditView.as_view()), name='provider/edit'),
@@ -68,7 +65,6 @@ urlpatterns = [
     # path('provider/doc/<str:doc_code>', login_required(ProviderDocView.as_view()), name='provider_doc'),
     path('provider/change_status/', change_provider_status, name='provider/change_status'),
 
-    path('service_tariff/', login_required(ServiceTariffListView.as_view()), name='service_tariff'),
     path('service_tariffs/', login_required(ServiceTariffsListView.as_view()), name='service_tariffs'),
     # path('service_tariff/<int:pk>', login_required(ServiceTariffDetailView.as_view()), name='service_tariff_detail'),