From 7d7db2a086ef2dc9f4c19d48a55cc82a7405f180 Mon Sep 17 00:00:00 2001
From: Michael Abashian <mabashian@ansible.com>
Date: Tue, 14 Jun 2016 11:36:48 -0400
Subject: [PATCH] Swapped the button order on the groups form. Fixed prompt
 action button class issue by making inv manage group delete action buttons
 unique id's (they were duplicates of the original prompt actions).

---
 awx/ui/client/src/forms/Groups.js                           | 6 +++---
 .../src/inventories/manage/groups/groups-list.partial.html  | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/awx/ui/client/src/forms/Groups.js b/awx/ui/client/src/forms/Groups.js
index 9a42ad6218..83b2af3aab 100644
--- a/awx/ui/client/src/forms/Groups.js
+++ b/awx/ui/client/src/forms/Groups.js
@@ -319,11 +319,11 @@ export default
             },
 
             buttons: {
-                save: {
-                    ngClick: 'formSave()'
-                },
                 cancel: {
                     ngClick: 'formCancel()'
+                },
+                save: {
+                    ngClick: 'formSave()'
                 }
             },
 
diff --git a/awx/ui/client/src/inventories/manage/groups/groups-list.partial.html b/awx/ui/client/src/inventories/manage/groups/groups-list.partial.html
index 50c687e18e..949769ec3d 100644
--- a/awx/ui/client/src/inventories/manage/groups/groups-list.partial.html
+++ b/awx/ui/client/src/inventories/manage/groups/groups-list.partial.html
@@ -64,8 +64,8 @@
                 <div class="GroupDelete-help--container">
                     <a href="" id="awp-promote" href="" aw-pop-over="<dl><dt>Delete</dt><dd>Deletes groups and hosts associated with the group being deleted. If a group or host is associated with other groups, it will still exist within those groups. Otherwise, the associated groups and hosts will no longer appear in the inventory.</dd>\n<dt style='margin-top: 5px;'>Promote</dt><dd>Groups and hosts associated with the group being removed will be promoted root level. Note: groups already associated with other groups cannot be promoted.</dd></dl>\n" aw-tool-tip="Click for help"  data-placement="right" data-container="body" data-title="Help" class="help-link"><i class="fa fa-question-circle"></i> Click for help</a>
                 </div>
-                  <a href="#" data-target="#group-delete-modal" data-dismiss="modal" id="prompt_cancel_btn" class="btn Modal-defaultButton Modal-footerButton">CANCEL</a>
-                  <a href="" ng-class="promptActionBtnClass" ng-click="confirmDelete()" id="prompt_action_btn" class="btn Modal-footerButton Modal-errorButton">DELETE</a>
+                  <a href="#" data-target="#group-delete-modal" data-dismiss="modal" id="prompt_cancel_btn_groups_list" class="btn Modal-defaultButton Modal-footerButton">CANCEL</a>
+                  <a href="" ng-class="promptActionBtnClass" ng-click="confirmDelete()" id="prompt_action_btn_groups_list" class="btn Modal-footerButton Modal-errorButton">DELETE</a>
               </div>
             </div>
         </div>