Commit 34a09795 authored by John Red Medrano's avatar John Red Medrano

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

* commit 'f72951d0':
  fixed error on change request template
parents 9b3fa07a f72951d0
from django_filters import rest_framework as filters from django_filters import rest_framework as filters
from django.db.models import Count from django.db.models import Count
from app.entities.models import ChangeRequestTemplateStakeHolders from app.entities.models import ChangeRequestTemplateHeader
from django.db.models import Q from django.db.models import Q
class headerFilter(filters.FilterSet): class headerFilter(filters.FilterSet):
class Meta: class Meta:
model = ChangeRequestTemplateStakeHolders model = ChangeRequestTemplateHeader
fields = '__all__' fields = '__all__'
from rest_framework.views import APIView from rest_framework.views import APIView
from rest_framework import viewsets as meviewsets from rest_framework import viewsets as meviewsets
from app.applicationlayer.cms.template import serializers
from app.entities import models from app.entities import models
from rest_framework.response import Response from rest_framework.response import Response
...@@ -31,6 +30,7 @@ from app.applicationlayer.cms.template.approver.serializers import ChangeRequest ...@@ -31,6 +30,7 @@ from app.applicationlayer.cms.template.approver.serializers import ChangeRequest
from app.applicationlayer.cms.template.stakeholder.serializers import ChangeRequestTemplateStakeHoldersSerializer from app.applicationlayer.cms.template.stakeholder.serializers import ChangeRequestTemplateStakeHoldersSerializer
from app.applicationlayer.cms.template.details.serializers import ChangeRequestTemplateDetailsSerializer from app.applicationlayer.cms.template.details.serializers import ChangeRequestTemplateDetailsSerializer
from app.applicationlayer.cms.template.attachment.serializers import ChangeRequestTemplateAttachmentsSerializer from app.applicationlayer.cms.template.attachment.serializers import ChangeRequestTemplateAttachmentsSerializer
from app.applicationlayer.cms.template.header.serializers import ChangeRequestTemplatesSerializer
from app.applicationlayer.cms.template.header.table_filters import headerFilter from app.applicationlayer.cms.template.header.table_filters import headerFilter
...@@ -44,8 +44,8 @@ from app.applicationlayer.cms.template.details.table_filters import DetailsFilte ...@@ -44,8 +44,8 @@ from app.applicationlayer.cms.template.details.table_filters import DetailsFilte
class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet): class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
queryset = models.ChangeRequestTemplateDetails.objects.all() queryset = models.ChangeRequestTemplateHeader.objects.all()
serializer_class = serializers.ChangeRequestTemplateDetailsSerializer serializer_class = ChangeRequestTemplatesSerializer
pagination_class = CustomPagination pagination_class = CustomPagination
lookup_field = 'template_no' lookup_field = 'template_no'
filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter) filter_backends = (DjangoFilterBackend, SearchFilter, OrderingFilter)
...@@ -61,8 +61,6 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet): ...@@ -61,8 +61,6 @@ class ChangeRequestTemplatesViewset(meviewsets.ModelViewSet):
def list(self, request, *args, **kwargs): def list(self, request, *args, **kwargs):
self.queryset = self.queryset.order_by('-created')
self.queryset = QuerySetHelper.Sort(self)
page = self.paginate_queryset(self.queryset) page = self.paginate_queryset(self.queryset)
......
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