From ffdf4063003ed749cc7ca79d1d7bc8509e0151fe Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Tue, 8 May 2018 17:09:52 -0400
Subject: [PATCH] reorder fields and make redirect_uri field not required on
 app form

---
 .../features/applications/add-applications.controller.js    | 1 -
 .../features/applications/add-edit-applications.view.html   | 6 +++---
 .../features/applications/edit-applications.controller.js   | 1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/awx/ui/client/features/applications/add-applications.controller.js b/awx/ui/client/features/applications/add-applications.controller.js
index 486c20dffb..c848bcd345 100644
--- a/awx/ui/client/features/applications/add-applications.controller.js
+++ b/awx/ui/client/features/applications/add-applications.controller.js
@@ -46,7 +46,6 @@ function AddApplicationsController (models, $state, strings) {
 
     vm.form.name.required = true;
     vm.form.organization.required = true;
-    vm.form.redirect_uris.required = true;
 
     delete vm.form.name.help_text;
 
diff --git a/awx/ui/client/features/applications/add-edit-applications.view.html b/awx/ui/client/features/applications/add-edit-applications.view.html
index 9f2bbb96d3..a7f2a87580 100644
--- a/awx/ui/client/features/applications/add-edit-applications.view.html
+++ b/awx/ui/client/features/applications/add-edit-applications.view.html
@@ -14,9 +14,9 @@
             <at-input-text col="4" tab="2" state="vm.form.description"></at-input-text>
             <at-input-lookup col="4" tab="3" state="vm.form.organization"></at-input-lookup>
             <at-divider></at-divider>
-            <at-input-text col="4" tab="4" state="vm.form.redirect_uris"></at-input-text>
-            <at-input-select col="4" tab="5" state="vm.form.client_type"></at-input-select>
-            <at-input-select col="4" tab="6" state="vm.form.authorization_grant_type"></at-input-select>
+            <at-input-select col="4" tab="4" state="vm.form.authorization_grant_type"></at-input-select>
+            <at-input-text col="4" tab="5" state="vm.form.redirect_uris"></at-input-text>
+            <at-input-select col="4" tab="6" state="vm.form.client_type"></at-input-select>
 
             <at-action-group col="12" pos="right">
                 <at-form-action type="cancel" to="applications"></at-form-action>
diff --git a/awx/ui/client/features/applications/edit-applications.controller.js b/awx/ui/client/features/applications/edit-applications.controller.js
index 60b08be6ba..1bf6b8c91b 100644
--- a/awx/ui/client/features/applications/edit-applications.controller.js
+++ b/awx/ui/client/features/applications/edit-applications.controller.js
@@ -53,7 +53,6 @@ function EditApplicationsController (models, $state, strings, $scope) {
     vm.form.disabled = !isEditable;
 
     vm.form.name.required = true;
-    vm.form.redirect_uris.required = true;
 
     const isOrgAdmin = _.some(me.get('related.admin_of_organizations.results'), (org) => org.id === organization.get('id'));
     const isSuperuser = me.get('is_superuser');