From 87e0c9020f995df8e97d9da199ee25d826a2e5aa Mon Sep 17 00:00:00 2001
From: Wayne Witzel III <wayne@riotousliving.com>
Date: Tue, 21 Feb 2017 02:33:45 -0500
Subject: [PATCH 1/2] explicit ordering in workflow_nodes views

---
 awx/api/views.py         | 13 ++++++++++++-
 awx/settings/defaults.py |  1 -
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/awx/api/views.py b/awx/api/views.py
index 33cff82049..0f4d6b25a8 100644
--- a/awx/api/views.py
+++ b/awx/api/views.py
@@ -3042,6 +3042,12 @@ class WorkflowJobTemplateWorkflowNodesList(WorkflowsEnforcementMixin, SubListCre
             data[fd] = None
         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):
 
@@ -3151,7 +3157,12 @@ class WorkflowJobWorkflowNodesList(WorkflowsEnforcementMixin, SubListAPIView):
     relationship = 'workflow_job_nodes'
     parent_key = 'workflow_job'
     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):
diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py
index 9bc51beaa7..9c77b5d381 100644
--- a/awx/settings/defaults.py
+++ b/awx/settings/defaults.py
@@ -267,7 +267,6 @@ REST_FRAMEWORK = {
         'awx.api.filters.TypeFilterBackend',
         'awx.api.filters.FieldLookupBackend',
         'rest_framework.filters.SearchFilter',
-        'rest_framework.filters.OrderingFilter',
         'awx.api.filters.OrderByBackend',
     ),
     'DEFAULT_PARSER_CLASSES': (

From a04411817f4e55bac74a4ce5bf93d81857a9c9db Mon Sep 17 00:00:00 2001
From: Wayne Witzel III <wayne@riotousliving.com>
Date: Fri, 24 Feb 2017 17:12:40 -0500
Subject: [PATCH 2/2] refactor based on review

---
 awx/api/views.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/awx/api/views.py b/awx/api/views.py
index 0f4d6b25a8..2d2473daef 100644
--- a/awx/api/views.py
+++ b/awx/api/views.py
@@ -3043,10 +3043,7 @@ class WorkflowJobTemplateWorkflowNodesList(WorkflowsEnforcementMixin, SubListCre
         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')
+        return super(WorkflowJobTemplateWorkflowNodesList, self).get_queryset().order_by('id')
 
 
 class WorkflowJobTemplateJobsList(WorkflowsEnforcementMixin, SubListAPIView):
@@ -3159,10 +3156,7 @@ class WorkflowJobWorkflowNodesList(WorkflowsEnforcementMixin, SubListAPIView):
     new_in_310 = True
 
     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')
+        return super(WorkflowJobWorkflowNodesList, self).get_queryset().order_by('id')
 
 
 class WorkflowJobCancel(WorkflowsEnforcementMixin, RetrieveAPIView):