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

Merge pull request #2415 from jaredevantabor/fix-2413

Browse Source 
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
parent 90d57300da a4e9f18d2b
commit 56fc5b104e
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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