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

Fixed issue with related set action buttons.

Browse Source
This commit is contained in:
chouseknecht
2013-10-07 17:21:48 -04:00
parent fc8b77823d
commit ac7f4af94d
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/static/js/forms/Organizations.js
View File

@@ -83,7 +83,7 @@ angular.module('OrganizationFormDefinition', [])
label: 'Edit', label: 'Edit',
ngClick: "edit('users', \{\{ user.id \}\}, '\{\{ user.username \}\}')", ngClick: "edit('users', \{\{ user.id \}\}, '\{\{ user.username \}\}')",
icon: 'icon-edit', icon: 'icon-edit',
'class': 'btn btn-default', 'class': 'btn-default',
awToolTip: 'Edit user' awToolTip: 'Edit user'
}, },
"delete": { "delete": {
@@ -128,7 +128,7 @@ angular.module('OrganizationFormDefinition', [])
ngClick: "edit('users', \{\{ admin.id \}\}, '\{\{ admin.username \}\}')", ngClick: "edit('users', \{\{ admin.id \}\}, '\{\{ admin.username \}\}')",
icon: 'icon-edit', icon: 'icon-edit',
awToolTip: 'Edit administrator', awToolTip: 'Edit administrator',
'class': 'btn btn-default' 'class': 'btn-default'
}, },
"delete": { "delete": {
label: 'Delete', label: 'Delete',

2
awx/ui/static/js/helpers/Groups.js
View File

@@ -722,8 +722,6 @@ angular.module('GroupsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', '
// Start the update process // Start the update process
scope.updateGroup = function() { scope.updateGroup = function() {
console.log('working on id: ' + scope.name);
console.log('source: ' + scope.source.value);
if (scope.source == "" || scope.source == null) { 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, ' + 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'); 'and then run an update.', 'alert-info');

4
awx/ui/static/lib/ansible/form-generator.js
View File

@@ -1522,9 +1522,9 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
html += "<button type=\"button\" class=\"btn btn-xs"; html += "<button type=\"button\" class=\"btn btn-xs";
html += (action['class']) ? " " + action['class'] : ""; html += (action['class']) ? " " + action['class'] : "";
html += "\" "; html += "\" ";
html += "id=\"row" + action + "_btn\" "; html += "id=\"row" + act + "_btn\" ";
html += this.attr(action,'ngClick'); 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) ? this.attr(action,'awToolTip') : "";
html += (action.awToolTip) ? "data-placement=\"top\" " : ""; html += (action.awToolTip) ? "data-placement=\"top\" " : "";
html += ">" + this.icon(action.icon); html += ">" + this.icon(action.icon);