Fix error

This commit is contained in:
Виктор Гладких 2019-12-02 15:12:17 +03:00
parent 5ee7c314c0
commit 6d9686b64a
3 changed files with 14 additions and 11 deletions

View File

@ -287,7 +287,9 @@ class User(AbstractUser):
class UserRole(ProjectBaseMixin): class UserRole(ProjectBaseMixin):
"""UserRole model.""" """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) role = models.ForeignKey(Role, verbose_name=_('Role'), on_delete=models.SET_NULL, null=True)
establishment = models.ForeignKey(Establishment, verbose_name=_('Establishment'), establishment = models.ForeignKey(Establishment, verbose_name=_('Establishment'),
on_delete=models.SET_NULL, null=True, blank=True) on_delete=models.SET_NULL, null=True, blank=True)

View File

@ -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 BackUserSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = User model = User
@ -49,3 +40,13 @@ class BackDetailUserSerializer(BackUserSerializer):
user.set_password(validated_data['password']) user.set_password(validated_data['password'])
user.save() user.save()
return user return user
class UserRoleSerializer(serializers.ModelSerializer):
class Meta:
model = models.UserRole
fields = [
'role',
'user',
'establishment'
]

View File

@ -13,7 +13,7 @@ class RoleLstView(generics.ListCreateAPIView):
class UserRoleLstView(generics.ListCreateAPIView): class UserRoleLstView(generics.ListCreateAPIView):
serializer_class = serializers.UserRoleSerializer serializer_class = serializers.UserRoleSerializer
queryset = models.Role.objects.all() queryset = models.UserRole.objects.all()
class UserLstView(generics.ListCreateAPIView): class UserLstView(generics.ListCreateAPIView):