From ac7f4af94dcedef381805d8bedcbec2472f8ed72 Mon Sep 17 00:00:00 2001
From: chouseknecht <chouse@ansibleworks.com>
Date: Mon, 7 Oct 2013 17:21:48 -0400
Subject: [PATCH] Fixed issue with related set action buttons.

---
 awx/ui/static/js/forms/Organizations.js     | 4 ++--
 awx/ui/static/js/helpers/Groups.js          | 2 --
 awx/ui/static/lib/ansible/form-generator.js | 4 ++--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/awx/ui/static/js/forms/Organizations.js b/awx/ui/static/js/forms/Organizations.js
index ff4a183e63..273c678552 100644
--- a/awx/ui/static/js/forms/Organizations.js
+++ b/awx/ui/static/js/forms/Organizations.js
@@ -83,7 +83,7 @@ angular.module('OrganizationFormDefinition', [])
                         label: 'Edit',
                         ngClick: "edit('users', \{\{ user.id \}\}, '\{\{ user.username \}\}')",
                         icon: 'icon-edit',
-                        'class': 'btn btn-default',
+                        'class': 'btn-default',
                         awToolTip: 'Edit user'
                         },
                     "delete": {
@@ -128,7 +128,7 @@ angular.module('OrganizationFormDefinition', [])
                         ngClick: "edit('users', \{\{ admin.id \}\}, '\{\{ admin.username \}\}')",
                         icon: 'icon-edit',
                         awToolTip: 'Edit administrator',
-                        'class': 'btn btn-default'
+                        'class': 'btn-default'
                         },
                     "delete": {
                         label: 'Delete',
diff --git a/awx/ui/static/js/helpers/Groups.js b/awx/ui/static/js/helpers/Groups.js
index a7731eb9d1..ef2d9ad606 100644
--- a/awx/ui/static/js/helpers/Groups.js
+++ b/awx/ui/static/js/helpers/Groups.js
@@ -722,8 +722,6 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
         
         // Start the update process
         scope.updateGroup = function() {
-            console.log('working on id: ' + scope.name);
-            console.log('source: ' + scope.source.value);
             if (scope.source == "" || scope.source == null) {
               Alert('Missing Configuration', 'The selected group is not configured for updates. You must first edit the group, provide Source settings, ' + 
                   'and then run an update.', 'alert-info');
diff --git a/awx/ui/static/lib/ansible/form-generator.js b/awx/ui/static/lib/ansible/form-generator.js
index 0538f7151e..df88cbc186 100644
--- a/awx/ui/static/lib/ansible/form-generator.js
+++ b/awx/ui/static/lib/ansible/form-generator.js
@@ -1522,9 +1522,9 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
                  html += "<button type=\"button\" class=\"btn btn-xs"; 
                  html += (action['class']) ? " " + action['class'] : "";
                  html += "\" "; 
-                 html += "id=\"row" + action + "_btn\" ";
+                 html += "id=\"row" + act + "_btn\" ";
                  html += this.attr(action,'ngClick');
-                 html += this.attr(action, 'ngShow');
+                 html += (action.ngShow) ? this.attr(action, 'ngShow') : "";
                  html += (action.awToolTip) ? this.attr(action,'awToolTip') : "";
                  html += (action.awToolTip) ? "data-placement=\"top\" " : "";
                  html += ">" + this.icon(action.icon);