Elgato_dark/zeppelin
1
0
Fork 0
mirror of https://github.com/apache/zeppelin synced 2026-05-24 09:38:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

change payload key name for interpreter syntax property

Browse source
This commit is contained in:
CloverHearts 2016-09-29 14:14:03 +09:00
parent de03a06006
commit ff43ce37a8
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
View file

@ -1595,11 +1595,11 @@ public class NotebookServer extends WebSocketServlet implements
private void getEditorSetting(NotebookSocket conn, Message fromMessage)
throws IOException {
String orderId = (String) fromMessage.get("orderId");
String paragraphId = (String) fromMessage.get("paragraphId");
String replName = (String) fromMessage.get("magic");
String noteId = getOpenNoteId(conn);
Message resp = new Message(OP.EDITOR_SETTING);
resp.put("orderId", orderId);
resp.put("paragraphId", paragraphId);
resp.put("editor", notebook().getInterpreterFactory().getEditorSetting(noteId, replName));
conn.send(serializeMessage(resp));
return;

2
zeppelin-web/src/app/notebook/paragraph/paragraph.controller.js
View file

@ -708,7 +708,7 @@ angular.module('zeppelinWebApp').controller('ParagraphCtrl', function($scope, $r
websocketMsgSrv.getEditorSetting($scope.paragraph.id, interpreterName);
$timeout(
$scope.$on('editorSetting', function(event, data) {
if ($scope.paragraph.id === data.orderId) {
if ($scope.paragraph.id === data.paragraphId) {
deferred.resolve(data);
}
}

4
zeppelin-web/src/components/websocketEvents/websocketMsg.service.js
View file

@ -180,11 +180,11 @@ angular.module('zeppelinWebApp').service('websocketMsgSrv', function($rootScope,
});
},
getEditorSetting: function(orderId, replName) {
getEditorSetting: function(paragraphId, replName) {
websocketEvents.sendNewEvent({
op: 'EDITOR_SETTING',
data: {
orderId: orderId,
paragraphId: paragraphId,
magic: replName
}
});