Fix error
This commit is contained in:
parent
5ee7c314c0
commit
6d9686b64a
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
]
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user