Merge branch 'master' into unstable

sharix_admin/templates/sharix_admin/base_admin.html

@@ -351,7 +351,7 @@
       </li> {% endcomment %}
       {% if "PARTNER-ADMIN" in user_groups %}
         <li class="nav-item">
-          <a href="{% url 'sharix_admin:partner_detail' %}" class="nav-link {% if current_page == 'partner' %}active rounded{% endif %}">
+          <a href="{% url 'sharix_admin:partner_detail_my' %}" class="nav-link {% if current_page == 'partner' %}active rounded{% endif %}">
             <div class="link d-flex align-items-center">
               <img
                 class="nav-img"
@@ -415,7 +415,9 @@
         </a>
       </li>
 
-
+      
+      {% include 'webservice_running/metaservice_menu.html' %}
+     
     </ul>
   </nav>
 

sharix_admin/urls.py

@@ -35,8 +35,9 @@ urlpatterns = [
 
     # Набор страниц по модели Партнер
     path('partners/', login_required(PartnersListView.as_view()), name='partners'),
+    path('partner/', login_required(PartnerDetailView.as_view()), name='partner_detail_my'),
     path('partner/<str:pk>', login_required(PartnerDetailView.as_view()), name='partner_detail'),
-    path('partner/edit/<int:pk>', login_required(PartnerEditView.as_view()), name='partner_edit'),
+    path('partner/edit/<int:pk>', login_required(PartnerEditView.as_view()), name='partner/edit'),
     path('partner/doc/<str:doc_code>/upload', login_required(PartnerDocUploadView.as_view()),
          name='partner_doc_upload'),
     path('partner/doc/<str:doc_code>', login_required(PartnerDocView.as_view()), name='partner_doc'),
@@ -45,7 +46,8 @@ urlpatterns = [
     #Набор страниц по модели Ресурс
     path('resources/', login_required(ResourcesListView.as_view()), name='resources'),
     #path('resource/<str:pk>', login_required(ResourceDetailView.as_view()), name='resource_detail'),
-#    path('resource/edit/<int:pk>', login_required(ResourceEditView.as_view()), name='resource_edit'),
+#    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/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'),
@@ -54,7 +56,7 @@ urlpatterns = [
     #Набор страниц по модели Исполнитель
     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'),
+#    path('provider/edit/<int:pk>', login_required(ProviderEditView.as_view()), name='provider/edit'),
 #    path('provider/doc/<str:doc_code>/upload', login_required(ProviderDocUploadView.as_view()),
 #         name='partner_doc_upload'),
 #    path('provider/doc/<str:doc_code>', login_required(ProviderDocView.as_view()), name='provider_doc'),

sharix_admin/views/base.py

@@ -12,6 +12,7 @@ class BaseView(UserPassesTestMixin, View):
 
     def dispatch(self, request, *args, **kwargs):
         self.user_groups = self.request.user.groups.values_list('name', flat=True)
+        #self.avaliable_menu = self.request.user.groups.values_list('name', flat=True)
         return super().dispatch(request, *args, **kwargs)
 
     def test_func(self):

sharix_admin/views/partner.py

@@ -35,12 +35,23 @@ class PartnerDetailView(PartnerBaseView, DetailView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
-        docs = Documents.objects.filter(
-            user=self.request.user,
-            company=self.object
-        ).prefetch_related('files').order_by('doc_type')
-
-        context.update({"docs": docs})
+        if not pk:
+            docs = Documents.objects.filter(
+                user=pk,
+                company=company.objects.filter(user=pk)
+                ).prefetch_related('files').order_by('doc_type')
+                #user=self.request.user,
+                #company=self.object
+            #).prefetch_related('files').order_by('doc_type')
+
+            context.update({"docs": docs})
+        else:
+            docs = Documents.objects.filter(
+                user=self.request.user,
+                company=self.object
+            ).prefetch_related('files').order_by('doc_type')
+
+            context.update({"docs": docs})
 
         return context