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

* commit 'cb6ba6a2':
  fix listing on form

app/applicationlayer/cms/form/header/views.py

@@ -84,6 +84,7 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
     
     def list(self, request, *args, **kwargs):
         self.serializer_class = ChangeRequestFormHeaderSerializerList
+        self.get_queryset = self.filter_queryset(self.get_queryset())
 
         id_number = self.request.user.code
         
@@ -110,9 +111,8 @@ class ChangeRequestFormsViewset(viewsets.ModelViewSet):
 
         self.queryset = self.queryset.order_by('-created')
 
-        queryset = self.filter_queryset(self.get_queryset())
 
-        page = self.paginate_queryset(queryset)
+        page = self.paginate_queryset(self.queryset)
 
         if page is not None:
             serializer = self.get_serializer(page, many=True)
@@ -1078,7 +1078,7 @@ class ChangeRequestFormPost(APIView):
             
             frm_id = serializer.data['form_code']
 
-            # create template approvers
+            # create form approvers
             frm_approvers = form_header['frm_approvers']
             counter = 0
             for frm_approver in frm_approvers:
@@ -1112,7 +1112,7 @@ class ChangeRequestFormPost(APIView):
             if serializerApprover.is_valid(raise_exception=True):
                 serializerApprover.save()
             
-            # create template stakes
+            # create form stakes
             if form_header['frm_stakes']:
                 frm_stakes = form_header['frm_stakes']
                 for frm_stake in frm_stakes:
@@ -1125,7 +1125,7 @@ class ChangeRequestFormPost(APIView):
                 if serializerStake.is_valid(raise_exception=True):
                     serializerStake.save()
             
-            # create template attachments
+            # create form attachments
             if form_header['frm_attachments']:
                 frm_attachments = form_header['frm_attachments']
                 for frm_attachment in frm_attachments:
@@ -1138,7 +1138,7 @@ class ChangeRequestFormPost(APIView):
                 if serializerAttach.is_valid(raise_exception=True):
                     serializerAttach.save()
 
-            # create template details
+            # create form details
             if form_header['frm_details']:
                 frm_details = form_header['frm_details']
                 for frm_detail in frm_details: