broadcast bugfix

cloverhearts · jongyoul · commit 2c7bd398c381 · 2016-12-15T14:58:26.000+09:00
diff --git a/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java b/zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
@@ -780,7 +780,7 @@ private void updatePersonalizedMode(NotebookSocket conn, HashSet<String> userAnd
 
     NotebookAuthorization notebookAuthorization = notebook.getNotebookAuthorization();
     if (!notebookAuthorization.isOwner(noteId, userAndRoles)) {
-      permissionError(conn, "rename", fromMessage.principal,
+      permissionError(conn, "persoanlized ", fromMessage.principal,
           userAndRoles, notebookAuthorization.getOwners(noteId));
       return;
     }
@@ -790,7 +790,7 @@ private void updatePersonalizedMode(NotebookSocket conn, HashSet<String> userAnd
       note.setPersonalizedMode(isPersonalized);
       AuthenticationInfo subject = new AuthenticationInfo(fromMessage.principal);
       note.persist(subject);
-      sendNote(conn, userAndRoles, notebook, fromMessage);
+      broadcastNote(note);
     }
   }
 
diff --git a/zeppelin-web/src/app/notebook/notebook.controller.js b/zeppelin-web/src/app/notebook/notebook.controller.js
@@ -927,6 +927,8 @@
 
       if ($scope.note === null) {
         $scope.note = note;
+      } else {
+        $scope.note.config.personalizedMode = note.config.personalizedMode;
       }
       initializeLookAndFeel();
       //open interpreter binding setting when there're none selected

Original file line number	Diff line number	Diff line change
`@@ -780,7 +780,7 @@ private void updatePersonalizedMode(NotebookSocket conn, HashSet<String> userAnd`
`780`	`780`
`781`	`781`	`NotebookAuthorization notebookAuthorization = notebook.getNotebookAuthorization();`
`782`	`782`	`if (!notebookAuthorization.isOwner(noteId, userAndRoles)) {`
`783`		`- permissionError(conn, "rename", fromMessage.principal,`
	`783`	`+ permissionError(conn, "persoanlized ", fromMessage.principal,`
`784`	`784`	`userAndRoles, notebookAuthorization.getOwners(noteId));`
`785`	`785`	`return;`
`786`	`786`	`}`
`@@ -790,7 +790,7 @@ private void updatePersonalizedMode(NotebookSocket conn, HashSet<String> userAnd`
`790`	`790`	`note.setPersonalizedMode(isPersonalized);`
`791`	`791`	`AuthenticationInfo subject = new AuthenticationInfo(fromMessage.principal);`
`792`	`792`	`note.persist(subject);`
`793`		`- sendNote(conn, userAndRoles, notebook, fromMessage);`
	`793`	`+ broadcastNote(note);`
`794`	`794`	`}`
`795`	`795`	`}`
`796`	`796`
Original file line number	Diff line number	Diff line change
`@@ -927,6 +927,8 @@`
`927`	`927`
`928`	`928`	`if ($scope.note === null) {`
`929`	`929`	`$scope.note = note;`
	`930`	`+ } else {`
	`931`	`+ $scope.note.config.personalizedMode = note.config.personalizedMode;`
`930`	`932`	`}`
`931`	`933`	`initializeLookAndFeel();`
`932`	`934`	`//open interpreter binding setting when there're none selected`