stakeholders create & list of psp organizations
This commit is contained in:
@@ -221,7 +221,9 @@ class OrganizationViewSet(ModelViewSet, DynamicSearchMixin):
|
||||
def list(self, request, *args, **kwargs):
|
||||
""" all organization """
|
||||
|
||||
page = self.paginate_queryset(self.queryset.order_by('-create_date')) # paginate queryset
|
||||
query = self.filter_query(self.queryset)
|
||||
|
||||
page = self.paginate_queryset(query.order_by('-create_date')) # paginate queryset
|
||||
|
||||
if page is not None:
|
||||
serializer = self.serializer_class(page, many=True)
|
||||
@@ -293,9 +295,14 @@ class OrganizationViewSet(ModelViewSet, DynamicSearchMixin):
|
||||
def get_organizations_by_province(self, request):
|
||||
""" list of organizations by province """
|
||||
|
||||
queryset = self.queryset.filter(province=int(request.GET['province']))
|
||||
if request.GET['province']:
|
||||
queryset = self.queryset.filter(province=int(request.GET['province']))
|
||||
else:
|
||||
queryset = self.queryset.filter(province=request.user.province)
|
||||
|
||||
page = self.paginate_queryset(queryset) # paginate queryset
|
||||
filtered_query = self.filter_query(queryset)
|
||||
|
||||
page = self.paginate_queryset(filtered_query.order_by('-create_date')) # paginate queryset
|
||||
|
||||
if page is not None:
|
||||
serializer = self.serializer_class(page, many=True)
|
||||
|
||||
Reference in New Issue
Block a user