External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-04-11 21:19:22 -02:30
Code Issues Packages Projects Releases Wiki Activity

Default empty max hosts to 0

Browse Source
This commit is contained in:
mabashian
2019-02-26 15:58:28 -05:00
committed by Jeff Bradberry
parent 98c5cb1c4c
commit 1b94b616f0
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/client/src/organizations/add/organizations-add.controller.js
View File

@@ -46,6 +46,9 @@ export default ['$scope', '$rootScope', '$location', '$stateParams',
for (fld in form.fields) { for (fld in form.fields) {
params[fld] = $scope[fld]; params[fld] = $scope[fld];
} }
if (!params.max_hosts || params.max_hosts === '') {
params.max_hosts = 0;
}
var url = GetBasePath(base); var url = GetBasePath(base);
url += (base !== 'organizations') ? $stateParams.project_id + '/organizations/' : ''; url += (base !== 'organizations') ? $stateParams.project_id + '/organizations/' : '';
Rest.setUrl(url); Rest.setUrl(url);
@@ -71,7 +74,7 @@ export default ['$scope', '$rootScope', '$location', '$stateParams',
let explanation = _.has(data, "name") ? data.name[0] : ""; let explanation = _.has(data, "name") ? data.name[0] : "";
ProcessErrors($scope, data, status, OrganizationForm, { ProcessErrors($scope, data, status, OrganizationForm, {
hdr: 'Error!', hdr: 'Error!',
msg: `Failed to save organization. PUT status: ${status}. ${explanation}` msg: `Failed to save organization. POST status: ${status}. ${explanation}`
}); });
}); });
}; };

5
awx/ui/client/src/organizations/edit/organizations-edit.controller.js
View File

@@ -56,7 +56,7 @@ export default ['$scope', '$location', '$stateParams', 'OrgAdminLookup',
$scope.organization_name = data.name; $scope.organization_name = data.name;
for (fld in form.fields) { for (fld in form.fields) {
if (data[fld]) { if (typeof data[fld] !== 'undefined') {
$scope[fld] = data[fld]; $scope[fld] = data[fld];
master[fld] = data[fld]; master[fld] = data[fld];
} }
@@ -97,6 +97,9 @@ export default ['$scope', '$location', '$stateParams', 'OrgAdminLookup',
for (fld in form.fields) { for (fld in form.fields) {
params[fld] = $scope[fld]; params[fld] = $scope[fld];
} }
if (!params.max_hosts || params.max_hosts === '') {
params.max_hosts = 0;
}
Rest.setUrl(defaultUrl + id + '/'); Rest.setUrl(defaultUrl + id + '/');
Rest.put(params) Rest.put(params)
.then(() => { .then(() => {