External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 07:17:40 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fixes errors thrown when saving groups add / edit forms

Browse Source 
Fixes incorrect ng-required statement affecting group form validity
This commit is contained in:
Leigh Johnson
2016-11-02 18:53:59 -04:00
parent 9a3902b2b6
commit 2084999e78
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
awx/ui/client/src/forms/Groups.js
View File

@@ -76,7 +76,6 @@ export default
ngShow: "source && source.value !== '' && source.value !== 'custom'", ngShow: "source && source.value !== '' && source.value !== 'custom'",
sourceModel: 'credential', sourceModel: 'credential',
sourceField: 'name', sourceField: 'name',
ngClick: 'lookupCredential()',
awRequiredWhen: { awRequiredWhen: {
reqExpression: "cloudCredentialRequired", reqExpression: "cloudCredentialRequired",
init: "false" init: "false"
@@ -146,12 +145,14 @@ export default
label : "Custom Inventory Script", label : "Custom Inventory Script",
type: 'lookup', type: 'lookup',
basePath: 'inventory_scripts', basePath: 'inventory_scripts',
list: 'InventoryScriptList', list: 'InventoryScriptsList',
ngShow: "source && source.value === 'custom'", ngShow: "source && source.value === 'custom'",
sourceModel: 'inventory_script', sourceModel: 'inventory_script',
sourceField: 'name', sourceField: 'name',
ngClick: 'lookUpInventory_script()' , awRequiredWhen: {
ngRequired: "source && source.value === 'custom'", reqExpression: "source && source.value === 'custom'",
init: "false"
},
ngDisabled: '!(group_obj.summary_fields.user_capabilities.edit || canAdd)', ngDisabled: '!(group_obj.summary_fields.user_capabilities.edit || canAdd)',
}, },
custom_variables: { custom_variables: {

4
awx/ui/client/src/inventories/manage/groups/groups-add.controller.js
View File

@@ -12,7 +12,7 @@ export default ['$state', '$stateParams', '$scope', 'GroupForm', 'CredentialList
form = GroupForm(); form = GroupForm();
init(); init();
function init() {n function init() {
// apply form definition's default field values // apply form definition's default field values
GenerateForm.applyDefaults(form, $scope); GenerateForm.applyDefaults(form, $scope);
@@ -45,7 +45,7 @@ export default ['$state', '$stateParams', '$scope', 'GroupForm', 'CredentialList
}; };
$scope.formSave = function() { $scope.formSave = function() {
var params, source; var params, source, json_data;
json_data = ToJSON($scope.parseType, $scope.variables, true); json_data = ToJSON($scope.parseType, $scope.variables, true);
// group fields // group fields
var group = { var group = {

2
awx/ui/client/src/inventories/manage/groups/groups-edit.controller.js
View File

@@ -61,7 +61,7 @@ export default ['$state', '$stateParams', '$scope', 'ToggleNotification', 'Parse
$state.go('^'); $state.go('^');
}; };
$scope.formSave = function() { $scope.formSave = function() {
var params, source; var params, source, json_data;
json_data = ToJSON($scope.parseType, $scope.variables, true); json_data = ToJSON($scope.parseType, $scope.variables, true);
// group fields // group fields
var group = { var group = {

6
awx/ui/client/src/inventories/manage/inventory-manage.route.js
View File

@@ -31,7 +31,8 @@ export default {
page: '1', page: '1',
order_by: 'name', order_by: 'name',
}, },
squash: true squash: true,
dynamic: true
}, },
host_search: { host_search: {
value: { value: {
@@ -39,7 +40,8 @@ export default {
page: '1', page: '1',
order_by: 'name', order_by: 'name',
}, },
squash: true squash: true,
dynamic: true
} }
}, },
ncyBreadcrumb: { ncyBreadcrumb: {