External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-08 09:57:35 -02:30
Code Issues Packages Projects Releases Wiki Activity

Double click issue on radio button

Browse Source 
The custom inventory script radio button when choosing a custom script under Inventory->Group->Source had to be clicked 2x in order to select a desired radio button. Fixed this issue. Had to rename the list iterator to 'source_script'
This commit is contained in:
Jared Tabor
2015-01-08 09:37:29 -05:00
parent 9900b13953
commit 94b0a62059
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/static/js/forms/Source.js
View File

@@ -112,7 +112,7 @@ angular.module('SourceFormDefinition', [])
ngShow: "source && source.value === 'custom'", ngShow: "source && source.value === 'custom'",
sourceModel: 'source_script', sourceModel: 'source_script',
sourceField: 'name', sourceField: 'name',
ngClick: 'lookUpCustom_inventory()', ngClick: 'lookUpSource_script()' , //'lookUpCustom_inventory()',
addRequired: true, addRequired: true,
editRequired: true editRequired: true
}, },

6
awx/ui/static/js/helpers/CustomInventory.js
View File

@@ -63,7 +63,7 @@ angular.module('CreateCustomInventoryHelper', [ 'Utilities', 'RestServices', 'Sc
SearchInit({ SearchInit({
scope: scope, scope: scope,
set: 'custom_inventories', set: 'source_scripts' , // 'custom_inventories',
list: list, list: list,
url: defaultUrl url: defaultUrl
}); });
@@ -219,7 +219,7 @@ function($compile, SchedulerInit, Rest, Wait, CustomInventoryList, CustomInvento
SearchInit({ SearchInit({
scope: scope, scope: scope,
set: 'custom_inventories', set: 'source_scripts', //'custom_inventories',
list: list, list: list,
url: url url: url
}); });
@@ -324,7 +324,7 @@ function($compile, CustomInventoryList, Rest, Wait, GenerateList, CustomInventor
SearchInit({ SearchInit({
scope: scope, scope: scope,
set: 'custom_inventories', set: 'source_scripts', //'custom_inventories',
list: list, list: list,
url: url url: url
}); });

10
awx/ui/static/js/lists/CustomInventory.js
View File

@@ -12,8 +12,8 @@
angular.module('CustomInventoryListDefinition', []) angular.module('CustomInventoryListDefinition', [])
.value('CustomInventoryList', { .value('CustomInventoryList', {
name: 'custom_inventories', name: 'source_scripts' , // 'custom_inventories',
iterator: 'custom_inventory', iterator: 'source_script', //'custom_inventory',
selectTitle: 'Add custom inventory', selectTitle: 'Add custom inventory',
editTitle: 'Custom Inventories', editTitle: 'Custom Inventories',
// selectInstructions: "<p>Select existing credentials by clicking each credential or checking the related checkbox. When " + // selectInstructions: "<p>Select existing credentials by clicking each credential or checking the related checkbox. When " +
@@ -37,7 +37,7 @@ angular.module('CustomInventoryListDefinition', [])
}, },
organization: { organization: {
label: 'Organization', label: 'Organization',
ngBind: 'custom_inventory.summary_fields.organization.name', ngBind: 'source_script.summary_fields.organization.name',
// linkTo: '/#/organizations/{{ custom_inventory.organization }}', // linkTo: '/#/organizations/{{ custom_inventory.organization }}',
sourceModel: 'organization', sourceModel: 'organization',
sourceField: 'name', sourceField: 'name',
@@ -56,7 +56,7 @@ angular.module('CustomInventoryListDefinition', [])
fieldActions: { fieldActions: {
edit: { edit: {
ngClick: "editCustomInv(custom_inventory.id)", ngClick: "editCustomInv(source_script.id)",
icon: 'fa-edit', icon: 'fa-edit',
label: 'Edit', label: 'Edit',
"class": 'btn-sm', "class": 'btn-sm',
@@ -65,7 +65,7 @@ angular.module('CustomInventoryListDefinition', [])
}, },
"delete": { "delete": {
ngClick: "deleteCustomInv(custom_inventory.id, custom_inventory.name)", ngClick: "deleteCustomInv(source_script.id, source_script.name)",
icon: 'fa-trash', icon: 'fa-trash',
label: 'Delete', label: 'Delete',
"class": 'btn-sm', "class": 'btn-sm',