External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-15 10:10:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5442 from wwitzel3/issue-5441

Browse Source 
make OrderingFilter part of our default filters
This commit is contained in:
Wayne Witzel III
2017-02-17 16:24:20 -05:00
committed by GitHub
parent 9a12973abd a55e79e94d
commit fd82f4280c
2 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/api/views.py
View File

@@ -44,7 +44,6 @@ from rest_framework.response import Response
from rest_framework.settings import api_settings from rest_framework.settings import api_settings
from rest_framework.views import exception_handler from rest_framework.views import exception_handler
from rest_framework import status from rest_framework import status
from rest_framework import filters
# Django REST Framework YAML # Django REST Framework YAML
from rest_framework_yaml.parsers import YAMLParser from rest_framework_yaml.parsers import YAMLParser
@@ -3152,8 +3151,6 @@ class WorkflowJobWorkflowNodesList(WorkflowsEnforcementMixin, SubListAPIView):
relationship = 'workflow_job_nodes' relationship = 'workflow_job_nodes'
parent_key = 'workflow_job' parent_key = 'workflow_job'
new_in_310 = True new_in_310 = True
filter_backends = (filters.OrderingFilter,)
order_fields = ('id', 'job', 'workflow_job', 'unified_job_template', 'created', 'modified')
ordering = ('id',) ordering = ('id',)

1
awx/settings/defaults.py
View File

@@ -267,6 +267,7 @@ REST_FRAMEWORK = {
'awx.api.filters.TypeFilterBackend', 'awx.api.filters.TypeFilterBackend',
'awx.api.filters.FieldLookupBackend', 'awx.api.filters.FieldLookupBackend',
'rest_framework.filters.SearchFilter', 'rest_framework.filters.SearchFilter',
'rest_framework.filters.OrderingFilter',
'awx.api.filters.OrderByBackend', 'awx.api.filters.OrderByBackend',
), ),
'DEFAULT_PARSER_CLASSES': ( 'DEFAULT_PARSER_CLASSES': (