Merge branch 'unstable' of blezz-tech/sharix-open-webapp-base into unstable

sharix_admin/api/serializers/custom_token.py

@@ -2,8 +2,8 @@ from rest_framework import serializers
 
 
 class CustomTokenSerializer(serializers.Serializer):
-    user_id = serializers.IntegerField(source='user.pk')
+    user = serializers.IntegerField(source='user.pk')
     auth_token = serializers.CharField(source="key")
 
     class Meta:
-        fields = ("user_id", "auth_token")
+        fields = ("user", "auth_token")

sharix_admin/tables.py

@@ -152,10 +152,10 @@ class ResourceTable(tables.Table):
             "td": {"width": "5%"}
         }
     )
-    # В user_id ссылка LinkColumn на страницу Аси "Информация о партнере" страница partner_information_form
-    user_id = tables.Column(
-        accessor='user_id.full_name',
-        order_by=('user_id.first_name', 'user_id.last_name'),
+    # В user ссылка LinkColumn на страницу Аси "Информация о партнере" страница partner_information_form
+    user = tables.Column(
+        accessor='user.full_name',
+        order_by=('user.first_name', 'user.last_name'),
         verbose_name=_('Responsible'),
         attrs={
             "td": {"width": "15%"}
@@ -211,9 +211,9 @@ class ProviderTable(tables.Table):
             "td": {"width": "5%"}
         }
     )
-    user_id = tables.Column(
-        accessor='user_id.full_name',
-        order_by=('user_id.first_name', 'user_id.last_name'),
+    user = tables.Column(
+        accessor='user.full_name',
+        order_by=('user.first_name', 'user.last_name'),
         verbose_name=_('Full Name'),
         attrs={
             "td": {"width": "15%"}

sharix_admin/views/cooperate.py

@@ -65,7 +65,7 @@ class CooperateView(BaseView, FormView):
             Documents.objects.bulk_create([
                 Documents(
                     company=instance,
-                    user_id=self.request.user,
+                    user=self.request.user,
                     doc_type=doc_code
                 ) for doc_code in doc_codes
             ])

sharix_admin/views/partner.py

@@ -33,7 +33,7 @@ class PartnerDetailView(PartnerBaseView, DetailView):
         context = super().get_context_data(**kwargs)
 
         docs = Documents.objects.filter(
-            user_id=self.request.user,
+            user=self.request.user,
             company=self.object
         ).prefetch_related('files').order_by('doc_type')
 
@@ -80,7 +80,7 @@ class PartnerDocUploadView(PartnerBaseView, FormView):
     def dispatch(self, request, *args, **kwargs):
         self.company = get_object_or_404(Company, repr=self.request.user)
         self.doc = Documents.objects.filter(
-            user_id=self.request.user,
+            user=self.request.user,
             company=self.company,
             doc_type=kwargs.get('doc_code')
         ).first()
@@ -135,7 +135,7 @@ class PartnerDocView(PartnerBaseView, DetailView):
         self.company = get_object_or_404(Company, repr=self.request.user)
 
         self.doc = Documents.objects.filter(
-            user_id=self.request.user,
+            user=self.request.user,
             company=self.company,
             doc_type=kwargs.get('doc_code')
         ).first()