Commit 95dc2296 authored by John Red Medrano's avatar John Red Medrano

fixing

parent fac20362
...@@ -13,7 +13,9 @@ class UserSerializer(serializers.ModelSerializer): ...@@ -13,7 +13,9 @@ class UserSerializer(serializers.ModelSerializer):
def to_representation(self, instance): def to_representation(self, instance):
ret = super().to_representation(instance) ret = super().to_representation(instance)
get_code = User.objects.get(id=instance.id)
ret['department'] = model_to_dict(instance.department) ret['department'] = model_to_dict(instance.department)
ret['code'] = str(get_code.code)
ret['company'] = model_to_dict(instance.department.company) ret['company'] = model_to_dict(instance.department.company)
application = instance.application.values() application = instance.application.values()
ret['application'] = application ret['application'] = application
......
...@@ -27,7 +27,7 @@ from rest_framework.exceptions import ParseError ...@@ -27,7 +27,7 @@ from rest_framework.exceptions import ParseError
class UserViewSet(viewsets.ModelViewSet): class UserViewSet(viewsets.ModelViewSet):
queryset = User.objects.all().order_by('-created') queryset = User.objects.all().order_by('-id')
serializer_class = serializer.UserSerializer serializer_class = serializer.UserSerializer
pagination_class = CustomPagination pagination_class = CustomPagination
lookup_field = 'code' lookup_field = 'code'
...@@ -77,7 +77,6 @@ class UserViewSet(viewsets.ModelViewSet): ...@@ -77,7 +77,6 @@ class UserViewSet(viewsets.ModelViewSet):
id=serializer.data['id'] id=serializer.data['id']
).update(password=password_hash) ).update(password=password_hash)
message = status_message_response( message = status_message_response(
201, 'success', 201, 'success',
'New Users created', serializer.data 'New Users created', serializer.data
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment