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

explicit ordering in workflow_nodes views

Browse Source
This commit is contained in:
Wayne Witzel III
2017-02-21 02:33:45 -05:00
parent 95e1caed56
commit 87e0c9020f
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/api/views.py
View File

@@ -3042,6 +3042,12 @@ class WorkflowJobTemplateWorkflowNodesList(WorkflowsEnforcementMixin, SubListCre
data[fd] = None data[fd] = None
return super(WorkflowJobTemplateWorkflowNodesList, self).update_raw_data(data) return super(WorkflowJobTemplateWorkflowNodesList, self).update_raw_data(data)
def get_queryset(self):
parent = self.get_parent_object()
self.check_parent_access(parent)
qs = self.request.user.get_queryset(self.model)
return qs.order_by('id')
class WorkflowJobTemplateJobsList(WorkflowsEnforcementMixin, SubListAPIView): class WorkflowJobTemplateJobsList(WorkflowsEnforcementMixin, SubListAPIView):
@@ -3151,7 +3157,12 @@ 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
ordering = ('id',)
def get_queryset(self):
parent = self.get_parent_object()
self.check_parent_access(parent)
qs = self.request.user.get_queryset(self.model)
return qs.order_by('id')
class WorkflowJobCancel(WorkflowsEnforcementMixin, RetrieveAPIView): class WorkflowJobCancel(WorkflowsEnforcementMixin, RetrieveAPIView):

1
awx/settings/defaults.py
View File

@@ -267,7 +267,6 @@ 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': (