Repository: zeppelin Updated Branches: refs/heads/master 967d71d4a -> c66943e44
[ZEPPELIN-1062] Get original InterpreterSetting when there is no change ### What is this PR for? When we update interpreter property values, we edit some values and click "save" button. Then a bootstrap dialog is show up. In this step, if we click "cancel", the updated value is still existed in the table. This new value is not stored actually. After refresh, the original value will be shown. I just get original InterpreterSetting(`getInterpreterSettings()`) when there is no change(`result`) for fixing this bug. ### What type of PR is it? Bug Fix ### Todos ### What is the Jira issue? [ZEPPELIN-1062](https://issues.apache.org/jira/browse/ZEPPELIN-1062) ### How should this be tested? It's really simple. Just see the below attached screenshots. ### Screenshots (if appropriate) - Before  - After  ### Questions: * Does the licenses files need update? No * Is there breaking changes for older versions? No * Does this needs documentation? No Author: AhyoungRyu <[email protected]> Closes #1088 from AhyoungRyu/ZEPPELIN-1062 and squashes the following commits: bd422f9 [AhyoungRyu] Address @prabhjyotsingh feedback ea00a87 [AhyoungRyu] Get original InterpreterSetting when there is no change Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/c66943e4 Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/c66943e4 Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/c66943e4 Branch: refs/heads/master Commit: c66943e444995bf9ce218ba934ca3b18f66147fe Parents: 967d71d Author: AhyoungRyu <[email protected]> Authored: Tue Jul 5 18:23:59 2016 +0900 Committer: Prabhjyot Singh <[email protected]> Committed: Wed Jul 6 09:21:17 2016 +0530 ---------------------------------------------------------------------- zeppelin-web/src/app/interpreter/interpreter.controller.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/c66943e4/zeppelin-web/src/app/interpreter/interpreter.controller.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/interpreter/interpreter.controller.js b/zeppelin-web/src/app/interpreter/interpreter.controller.js index 4df4ca6..5d87aae 100644 --- a/zeppelin-web/src/app/interpreter/interpreter.controller.js +++ b/zeppelin-web/src/app/interpreter/interpreter.controller.js @@ -103,7 +103,9 @@ angular.module('zeppelinWebApp').controller('InterpreterCtrl', function($scope, $scope.updateInterpreterSetting = function(form, settingId) { var thisConfirm = BootstrapDialog.confirm({ - closable: true, + closable: false, + closeByBackdrop: false, + closeByKeyboard: false, title: '', message: 'Do you want to update this interpreter and restart with new settings?', callback: function (result) { @@ -150,6 +152,8 @@ angular.module('zeppelinWebApp').controller('InterpreterCtrl', function($scope, thisConfirm.close(); }); return false; + } else { + form.$show(); } } });
