Skip to content

Replace notebook -> note #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tae-jun merged 1 commit into from
Nov 20, 2016
+3 −3
Merged

Replace notebook -> note #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions zeppelin-server/src/main/java/org/apache/zeppelin/socket/NotebookServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -602,7 +602,7 @@ void permissionError(NotebookSocket conn, String op,
op, userAndRoles, allowed);

conn.send(serializeMessage(new Message(OP.AUTH_INFO).put("info",
"Insufficient privileges to " + op + " notebook.\n\n" +
"Insufficient privileges to " + op + ".\n\n" +
"Allowed users or roles: " + allowed.toString() + "\n\n" +
"But the user " + userName + " belongs to: " + userAndRoles.toString())));
}
Expand Down Expand Up @@ -713,7 +713,7 @@ private void renameNote(NotebookSocket conn, HashSet<String> userAndRoles,

NotebookAuthorization notebookAuthorization = notebook.getNotebookAuthorization();
if (!notebookAuthorization.isOwner(noteId, userAndRoles)) {
permissionError(conn, "rename", fromMessage.principal,
permissionError(conn, "rename the note", fromMessage.principal,
userAndRoles, notebookAuthorization.getOwners(noteId));
return;
}
Expand Down
2 changes: 1 addition & 1 deletion zeppelin-web/src/components/noteName-create/note-name-dialog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ <h4 class="modal-title" ng-show="notenamectrl.clone">Clone note</h4>
</select>
</div>
</div>
Use '/' to create folders. Example: /NoteDirA/Notebook1
Use '/' to create folders. Example: /NoteDirA/Note1
</div>
<div class="modal-footer">
<button type="button" id="createNoteButton"
Expand Down