Merge pull request #2415 from jaredevantabor/fix-2413

Fixes Discard Changes & Save buttons in Settings page
This commit is contained in:
Jared Tabor 2018-07-05 10:01:24 -07:00 committed by GitHub
commit 56fc5b104e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -317,15 +317,21 @@ export default [
"class": "btn Form-cancelButton",
"id": "formmodal-cancel-button",
onClick: function() {
clearApiErrors();
populateFromApi();
$scope[formTracker.currentFormName()].$setPristine();
$('#FormModal-dialog').dialog('close');
$state.go('setup');
}
}, {
label: i18n._("Save changes"),
onClick: function() {
$scope.formSave();
$('#FormModal-dialog').dialog('close');
$state.go('setup');
vm.formSave().then(() => {
$scope[formTracker.currentFormName()].$setPristine();
$('#FormModal-dialog').dialog('close');
}).catch(()=> {
event.preventDefault();
$('#FormModal-dialog').dialog('close');
});
},
"class": "btn btn-primary",
"id": "formmodal-save-button"