From 6d9686b64a96f9ffe52fa40ef55afe576ea063a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=92=D0=B8=D0=BA=D1=82=D0=BE=D1=80=20=D0=93=D0=BB=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=BA=D0=B8=D1=85?= <v.gladkikh@spider.ru>
Date: Mon, 2 Dec 2019 15:12:17 +0300
Subject: [PATCH] Fix error

---
 apps/account/models.py           |  4 +++-
 apps/account/serializers/back.py | 19 ++++++++++---------
 apps/account/views/back.py       |  2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/apps/account/models.py b/apps/account/models.py
index c212ffda..956baa56 100644
--- a/apps/account/models.py
+++ b/apps/account/models.py
@@ -287,7 +287,9 @@ class User(AbstractUser):
 
 class UserRole(ProjectBaseMixin):
     """UserRole model."""
-    user = models.ForeignKey(User, verbose_name=_('User'), on_delete=models.CASCADE)
+    user = models.ForeignKey('account.User',
+                             verbose_name=_('User'),
+                             on_delete=models.CASCADE)
     role = models.ForeignKey(Role, verbose_name=_('Role'), on_delete=models.SET_NULL, null=True)
     establishment = models.ForeignKey(Establishment, verbose_name=_('Establishment'),
                                       on_delete=models.SET_NULL, null=True, blank=True)
diff --git a/apps/account/serializers/back.py b/apps/account/serializers/back.py
index 57c3fb42..b2316734 100644
--- a/apps/account/serializers/back.py
+++ b/apps/account/serializers/back.py
@@ -13,15 +13,6 @@ class RoleSerializer(serializers.ModelSerializer):
         ]
 
 
-class UserRoleSerializer(serializers.ModelSerializer):
-    class Meta:
-        model = models.UserRole
-        fields = [
-            'user',
-            'role'
-        ]
-
-
 class BackUserSerializer(serializers.ModelSerializer):
     class Meta:
         model = User
@@ -49,3 +40,13 @@ class BackDetailUserSerializer(BackUserSerializer):
         user.set_password(validated_data['password'])
         user.save()
         return user
+
+
+class UserRoleSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = models.UserRole
+        fields = [
+            'role',
+            'user',
+            'establishment'
+        ]
diff --git a/apps/account/views/back.py b/apps/account/views/back.py
index b3d77d1e..80775b3a 100644
--- a/apps/account/views/back.py
+++ b/apps/account/views/back.py
@@ -13,7 +13,7 @@ class RoleLstView(generics.ListCreateAPIView):
 
 class UserRoleLstView(generics.ListCreateAPIView):
     serializer_class = serializers.UserRoleSerializer
-    queryset = models.Role.objects.all()
+    queryset = models.UserRole.objects.all()
 
 
 class UserLstView(generics.ListCreateAPIView):