Repository: zeppelin Updated Branches: refs/heads/master 5975125f1 -> a4fc5abea
[ZEPPELIN-1007] Toggle only one of the interpreter/permission settings ### What is this PR for? Prevent Interpreter binding and Note Permissions dialog opens at the same time. ### What type of PR is it? Improvement ### What is the Jira issue? [ZEPPELIN-1007](https://issues.apache.org/jira/browse/ZEPPELIN-1007) ### 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: Mina Lee <[email protected]> Closes #1062 from minahlee/ZEPPELIN-1007 and squashes the following commits: dcf4823 [Mina Lee] Toggle only one of the interpreter/permission settings Project: http://git-wip-us.apache.org/repos/asf/zeppelin/repo Commit: http://git-wip-us.apache.org/repos/asf/zeppelin/commit/a4fc5abe Tree: http://git-wip-us.apache.org/repos/asf/zeppelin/tree/a4fc5abe Diff: http://git-wip-us.apache.org/repos/asf/zeppelin/diff/a4fc5abe Branch: refs/heads/master Commit: a4fc5abea697fc2a0e024169ae41d98f385097b2 Parents: 5975125 Author: Mina Lee <[email protected]> Authored: Tue Jun 21 17:52:17 2016 -0700 Committer: Mina Lee <[email protected]> Committed: Sat Jun 25 23:20:07 2016 -0700 ---------------------------------------------------------------------- zeppelin-web/src/app/notebook/notebook.controller.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zeppelin/blob/a4fc5abe/zeppelin-web/src/app/notebook/notebook.controller.js ---------------------------------------------------------------------- diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js b/zeppelin-web/src/app/notebook/notebook.controller.js index 944402a..bd75711 100644 --- a/zeppelin-web/src/app/notebook/notebook.controller.js +++ b/zeppelin-web/src/app/notebook/notebook.controller.js @@ -612,7 +612,7 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', BootstrapDialog.confirm({ closable: true, title: '', - message: 'Changes will be discarded.', + message: 'Interpreter setting changes will be discarded.', callback: function(result) { if (result) { $scope.$apply(function() { @@ -651,6 +651,7 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', $scope.closeSetting(); } else { $scope.openSetting(); + $scope.closePermissions(); } }; @@ -752,6 +753,7 @@ angular.module('zeppelinWebApp').controller('NotebookCtrl', $scope.closePermissions(); } else { $scope.openPermissions(); + $scope.closeSetting(); } };
