Commit afcabee6 authored by John Red Medrano's avatar John Red Medrano

Merge pull request #133 in RMS/api-main-service from red-develop to RMSv2

* commit '082c45e7':
  edit current user and change the pagination on change request template
parents bfaa00aa 082c45e7
...@@ -34,7 +34,7 @@ from app.entities import enums, models ...@@ -34,7 +34,7 @@ from app.entities import enums, models
from django.db.models import Q from django.db.models import Q
from app.applicationlayer.management.account.serializer import ChangeRequestList from app.applicationlayer.management.account.serializer import ChangeRequestList
from app.applicationlayer.utils import log_save from app.applicationlayer.utils import log_save, CustomPagination
from rest_framework.exceptions import ParseError from rest_framework.exceptions import ParseError
...@@ -106,14 +106,33 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet): ...@@ -106,14 +106,33 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
queryset = models.ChangeRequestTemplateHeader.objects.all() queryset = models.ChangeRequestTemplateHeader.objects.all()
lookup_field = 'template_no' lookup_field = 'template_no'
serializer_class = serializers.ChangeRequestTemplatesSerializer serializer_class = serializers.ChangeRequestTemplatesSerializer
pagination_class = paginators.SimplePageNumberPagination pagination_class = CustomPagination
def list(self, request, *args, **kwargs): def list(self, request, *args, **kwargs):
self.queryset = self.queryset.order_by('-created') self.queryset = self.queryset.order_by('-created')
self.queryset = QuerySetHelper.Sort(self) self.queryset = QuerySetHelper.Sort(self)
return super(ChangeRequestTemplatesViewset, self).list(request) page = self.paginate_queryset(self.queryset)
if page is not None:
serializer = self.get_serializer(page, many=True)
message = status_message_response(
200,
'success',
'list of Templates found',
serializer.data
)
return self.get_paginated_response(message)
serializer = self.get_serializer(self.queryset, many=True)
return Response(
serializer.data,
status=status.HTTP_200_OK
)
def retrieve(self, request, *args, **kwargs): def retrieve(self, request, *args, **kwargs):
instance = self.queryset.filter( instance = self.queryset.filter(
...@@ -223,7 +242,7 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet): ...@@ -223,7 +242,7 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
"Unable to edit due to existing transaction", "Unable to edit due to existing transaction",
status=status.HTTP_400_BAD_REQUEST status=status.HTTP_400_BAD_REQUEST
) )
@action( @action(
methods=['PATCH'], detail=True, methods=['PATCH'], detail=True,
url_path='archived', url_name='archived' url_path='archived', url_name='archived'
......
...@@ -125,8 +125,8 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer): ...@@ -125,8 +125,8 @@ class UserManagementRetreiveSerializer(serializers.ModelSerializer):
name__icontains="user" name__icontains="user"
) )
mod = mod.exclude(parent=0) # mod = mod.exclude(parent=0)
mod = ModuleSerializer(data=mod, many=True) mod = ModuleSerializer(data=mod, many=True)
mod.is_valid() mod.is_valid()
......
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