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

Fixes the CTiT save errors. I added a toast message for successful saves too.

Browse Source
This commit is contained in:
Jared Tabor 2018-05-18 15:03:44 -07:00
parent 86616c4062
commit 7610c660cb
No known key found for this signature in database
GPG Key ID: 1B343EC4C3CF7E5C
6 changed files with 59 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/legacy/styles/ansible-ui.less
View File

@ -1256,6 +1256,10 @@ input[type="checkbox"].checkbox-no-label {
color:@red;
}
.error-border {
border-color:@red;
}
.connecting-color {
color: @warning;
}

3
awx/ui/client/src/configuration/auth-form/configuration-auth.controller.js
View File

@ -110,6 +110,9 @@ export default [
authVm.activeAuthForm = getActiveAuthForm();
formTracker.setCurrentAuth(authVm.activeAuthForm);
$('#FormModal-dialog').dialog('close');
}).catch(() => {
event.preventDefault();
$('#FormModal-dialog').dialog('close');
});
},
"class": "btn btn-primary",

5
awx/ui/client/src/configuration/configuration.block.less
View File

@ -186,3 +186,8 @@ input#filePickerText {
hr {
height: 1px;
}
.ConfigureTower-errorIcon{
margin-right:5px;
color:@red;
}

63
awx/ui/client/src/configuration/configuration.controller.js
View File

@ -8,7 +8,7 @@ import defaultStrings from '~assets/default.strings.json';
export default [
'$scope', '$rootScope', '$state', '$stateParams', '$timeout', '$q', 'Alert',
'ConfigurationService', 'ConfigurationUtils', 'CreateDialog', 'CreateSelect2', 'i18n', 'ParseTypeChange', 'ProcessErrors', 'Store',
'Wait', 'configDataResolve', 'ToJSON', 'ConfigService',
'Wait', 'configDataResolve', 'ToJSON', 'ConfigService', 'ngToast',
//Form definitions
'configurationAzureForm',
'configurationGithubForm',
@ -32,7 +32,7 @@ export default [
function(
$scope, $rootScope, $state, $stateParams, $timeout, $q, Alert,
ConfigurationService, ConfigurationUtils, CreateDialog, CreateSelect2, i18n, ParseTypeChange, ProcessErrors, Store,
Wait, configDataResolve, ToJSON, ConfigService,
Wait, configDataResolve, ToJSON, ConfigService, ngToast,
//Form definitions
configurationAzureForm,
configurationGithubForm,
@ -241,10 +241,15 @@ export default [
}, {
label: i18n._("Save changes"),
onClick: function() {
vm.formSave();
$scope[formTracker.currentFormName()].$setPristine();
$('#FormModal-dialog').dialog('close');
active(setForm);
vm.formSave().then(() => {
$scope[formTracker.currentFormName()].$setPristine();
$('#FormModal-dialog').dialog('close');
active(setForm);
}).catch(()=> {
event.preventDefault();
$('#FormModal-dialog').dialog('close');
});
},
"class": "btn btn-primary",
"id": "formmodal-save-button"
@ -396,11 +401,12 @@ export default [
}
loginUpdate();
})
.catch(function(error) {
ProcessErrors($scope, error, status, formDefs[formTracker.getCurrent()],
.catch(function(data) {
ProcessErrors($scope, data.error, data.status, formDefs[formTracker.getCurrent()],
{
hdr: i18n._('Error!'),
msg: i18n._('There was an error resetting value. Returned status: ') + error.detail
hdr: `<i class="fa fa-warning ConfigureTower-errorIcon"></i>
<span class="error-color">${ i18n._('Error!')} </span>`,
msg: i18n._('There was an error resetting value. Returned status: ') + data.error.detail
});
})
@ -495,14 +501,23 @@ export default [
saveDeferred.resolve(data);
$scope[formTracker.currentFormName()].$setPristine();
ngToast.success({
timeout: 2000,
dismissButton: false,
dismissOnTimeout: true,
content: `<i class="fa fa-check-circle
Toast-successIcon"></i>` +
i18n._('Save Complete')
});
})
.catch(function(error, status) {
ProcessErrors($scope, error, status, formDefs[formTracker.getCurrent()],
.catch(function(data) {
ProcessErrors($scope, data.data, data.status, formDefs[formTracker.getCurrent()],
{
hdr: i18n._('Error!'),
msg: i18n._('Failed to save settings. Returned status: ') + status
hdr: `<i class="fa fa-warning ConfigureTower-errorIcon"></i>
<span class="error-color">${ i18n._('Error!')} </span>`,
msg: i18n._('Failed to save settings. Returned status: ') + data.status
});
saveDeferred.reject(error);
saveDeferred.reject(data);
})
.finally(function() {
Wait('stop');
@ -528,13 +543,14 @@ export default [
.then(function() {
//TODO consider updating form values with returned data here
})
.catch(function(error, status) {
.catch(function(data) {
//Change back on unsuccessful update
$scope[key] = !$scope[key];
ProcessErrors($scope, error, status, formDefs[formTracker.getCurrent()],
ProcessErrors($scope, data.data, data.status, formDefs[formTracker.getCurrent()],
{
hdr: i18n._('Error!'),
msg: i18n._('Failed to save toggle settings. Returned status: ') + error.detail
hdr: `<i class="fa fa-warning ConfigureTower-errorIcon"></i>
<span class="error-color">${ i18n._('Error!')} </span>`,
msg: i18n._('Failed to save toggle settings. Returned status: ') + data.status
});
})
.finally(function() {
@ -577,11 +593,12 @@ export default [
});
})
.catch(function(error) {
ProcessErrors($scope, error, status, formDefs[formTracker.getCurrent()],
.catch(function(data) {
ProcessErrors($scope, data.error, data.status, formDefs[formTracker.getCurrent()],
{
hdr: i18n._('Error!'),
msg: i18n._('There was an error resetting values. Returned status: ') + error.detail
hdr: `<i class="fa fa-warning ConfigureTower-errorIcon"></i>
<span class="error-color">${ i18n._('Error!')} </span>`,
msg: i18n._('There was an error resetting values. Returned status: ') + data.error.detail
});
})
.finally(function() {

4
awx/ui/client/src/configuration/configuration.service.js
View File

@ -50,7 +50,7 @@ export default ['$rootScope', 'GetBasePath', 'ProcessErrors', '$q', '$http', 'Re
.then(({data}) => {
deferred.resolve(data);
})
.catch(({error}) => {
.catch((error) => {
deferred.reject(error);
});
@ -64,7 +64,7 @@ export default ['$rootScope', 'GetBasePath', 'ProcessErrors', '$q', '$http', 'Re
.then(({data}) => {
deferred.resolve(data);
})
.catch(({error}) => {
.catch((error) => {
deferred.reject(error);
});

7
awx/ui/client/src/shared/Utilities.js
View File

@ -209,14 +209,17 @@ angular.module('Utilities', ['RestServices', 'Utilities'])
} else {
if (data[field]) {
scope[field + '_api_error'] = data[field][0];
//scope[form.name + '_form'][field].$setValidity('apiError', false);
$('[name="' + field + '"]').addClass('ng-invalid');
$('label[for="' + field + '"] span').addClass('error-color');
$('html, body').animate({scrollTop: $('[name="' + field + '"]').offset().top}, 0);
fieldErrors = true;
if(form.fields[field].codeMirror){
$(`#cm-${field}-container .CodeMirror`).addClass('error-border');
}
}
}
}
if ((!fieldErrors) && defaultMsg) {
if (defaultMsg) {
Alert(defaultMsg.hdr, defaultMsg.msg);
}
} else if (typeof data === 'object' && data !== null) {