添加默认笔记本,默认笔记本无法删除。修改初始化数据添加默认笔记本数据。修改bug #23

This commit is contained in:
asktalk
2014-12-07 00:12:17 +08:00
parent c49593171c
commit ed75704032
47 changed files with 79 additions and 73 deletions

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.albums", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.albums" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.attachs", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.attachs" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.blog_comments", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.blog_comments" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.blog_likes", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.blog_likes" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.blog_singles", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.blog_singles" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.configs", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.configs" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.email_logs", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.email_logs" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.files", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.files" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.find_pwds", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.find_pwds" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.group_users", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.group_users" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.groups", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.groups" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.has_share_notes", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1, "ToUserId" : 1 }, "unique" : true, "ns" : "leanote_beta2.has_share_notes", "name" : "UserId_1_ToUserId_1" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.has_share_notes" }, { "v" : 1, "unique" : true, "key" : { "UserId" : 1, "ToUserId" : 1 }, "name" : "UserId_1_ToUserId_1", "ns" : "leanote.has_share_notes" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.leanote.ShareNotes", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1, "ToUserId" : 1, "NoteId" : 1 }, "unique" : true, "ns" : "leanote_beta2.leanote.ShareNotes", "name" : "UserId_1_ToUserId_1_NoteId_1" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.leanote.ShareNotes" }, { "v" : 1, "unique" : true, "key" : { "UserId" : 1, "ToUserId" : 1, "NoteId" : 1 }, "name" : "UserId_1_ToUserId_1_NoteId_1", "ns" : "leanote.leanote.ShareNotes" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.leanote.has_share_notes", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1, "ToUserId" : 1 }, "unique" : true, "ns" : "leanote_beta2.leanote.has_share_notes", "name" : "UserId_1_ToUserId_1" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.leanote.has_share_notes" }, { "v" : 1, "unique" : true, "key" : { "UserId" : 1, "ToUserId" : 1 }, "name" : "UserId_1_ToUserId_1", "ns" : "leanote.leanote.has_share_notes" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.note_content_histories", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.note_content_histories" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.note_contents", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.note_contents" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.note_images", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.note_images" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.notebooks", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1 }, "ns" : "leanote_beta2.notebooks", "name" : "UserId_1" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.notebooks" }, { "v" : 1, "key" : { "UserId" : 1 }, "name" : "UserId_1", "ns" : "leanote.notebooks" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.notes", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1 }, "ns" : "leanote_beta2.notes", "name" : "UserId_1" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.notes" }, { "v" : 1, "key" : { "UserId" : 1 }, "name" : "UserId_1", "ns" : "leanote.notes" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.reports", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.reports" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.sessions", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.sessions" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.share_notebooks", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.share_notebooks" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.share_notes", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.share_notes" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.suggestions", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.suggestions" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.tag_count", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.tag_count" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.tags", "name" : "_id_" }, { "v" : 1, "key" : { "UserId" : 1 }, "ns" : "leanote_beta2.tags", "name" : "UserId_1" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.tags" }, { "v" : 1, "key" : { "UserId" : 1 }, "name" : "UserId_1", "ns" : "leanote.tags" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.themes", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.themes" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.tokens", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.tokens" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.user_blogs", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.user_blogs" } ] }

View File

@ -1 +1 @@
{ "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "ns" : "leanote_beta2.users", "name" : "_id_" } ] } { "indexes" : [ { "v" : 1, "key" : { "_id" : 1 }, "name" : "_id_", "ns" : "leanote.users" } ] }

View File

@ -60,13 +60,13 @@ Notebook.getNotebookTitle = function(notebookId) {
} }
} }
/** /**
* 我的notebooks * 我的notebooks
<ul class="folderBody" id="notebookList"> <ul class="folderBody" id="notebookList">
<li><a class="active">所有</a></li> <li><a class="active">所有</a></li>
<li><a class="active">Hadoop</a></li> <li><a class="active">Hadoop</a></li>
<li><a>August 13, 2013</a></li> <li><a>August 13, 2013</a></li>
</ul> </ul>
*/ */
Notebook.getTreeSetting = function(isSearch, isShare){ Notebook.getTreeSetting = function(isSearch, isShare){
@ -236,7 +236,7 @@ Notebook.getTreeSetting = function(isSearch, isShare){
} }
return setting; return setting;
} }
Notebook.allNotebookId = "0"; Notebook.allNotebookId = "0";
Notebook.trashNotebookId = "-1"; Notebook.trashNotebookId = "-1";
Notebook.curNotebookIsTrashOrAll = function() { Notebook.curNotebookIsTrashOrAll = function() {
@ -401,38 +401,38 @@ Notebook.changeNav = function() {
log(t2-t1); log(t2-t1);
} }
/** /**
* 我的共享notebooks * 我的共享notebooks
<div id="shareNotebooks"> <div id="shareNotebooks">
<div class="folderNote closed"> <div class="folderNote closed">
<div class="folderHeader"> <div class="folderHeader">
<a> <a>
<h1> <h1>
<i class="fa fa-angle-right"></i> <i class="fa fa-angle-right"></i>
Life's</h1> Life's</h1>
</a> </a>
</div> </div>
<ul class="folderBody"> <ul class="folderBody">
<li><a>Hadoop</a></li> <li><a>Hadoop</a></li>
<li><a>Node webkit</a></li> <li><a>Node webkit</a></li>
<li><a>Hadoop</a></li> <li><a>Hadoop</a></li>
<li><a>Node webkit</a></li> <li><a>Node webkit</a></li>
</ul> </ul>
</div> </div>
*/ */
// TODO 层级 // TODO 层级
Notebook.renderShareNotebooks = function(sharedUserInfos, shareNotebooks) { Notebook.renderShareNotebooks = function(sharedUserInfos, shareNotebooks) {
if(isEmpty(sharedUserInfos)) { if(isEmpty(sharedUserInfos)) {
return; return;
} }
if(!shareNotebooks || typeof shareNotebooks != "object" || shareNotebooks.length < 0) { if(!shareNotebooks || typeof shareNotebooks != "object" || shareNotebooks.length < 0) {
return; return;
} }
var $shareNotebooks = $("#shareNotebooks"); var $shareNotebooks = $("#shareNotebooks");
var user2ShareNotebooks = {}; var user2ShareNotebooks = {};
for(var i in shareNotebooks) { for(var i in shareNotebooks) {
var userNotebooks = shareNotebooks[i]; var userNotebooks = shareNotebooks[i];
user2ShareNotebooks[userNotebooks.UserId] = userNotebooks; user2ShareNotebooks[userNotebooks.UserId] = userNotebooks;
} }
@ -442,17 +442,17 @@ Notebook.renderShareNotebooks = function(sharedUserInfos, shareNotebooks) {
userNotebooks.ShareNotebooks = [{NotebookId: "-2", Title: "默认共享"}].concat(userNotebooks.ShareNotebooks) userNotebooks.ShareNotebooks = [{NotebookId: "-2", Title: "默认共享"}].concat(userNotebooks.ShareNotebooks)
var username = userInfo.Username || userInfo.Email; var username = userInfo.Username || userInfo.Email;
var header = tt('<div class="folderNote closed"><div class="folderHeader"><a><h1 title="? 的共享"><i class="fa fa-angle-right"></i>?</h1></a></div>', username, username); var header = tt('<div class="folderNote closed"><div class="folderHeader"><a><h1 title="? 的共享"><i class="fa fa-angle-right"></i>?</h1></a></div>', username, username);
var body = '<ul class="folderBody">'; var body = '<ul class="folderBody">';
for(var j in userNotebooks.ShareNotebooks) { for(var j in userNotebooks.ShareNotebooks) {
var notebook = userNotebooks.ShareNotebooks[j]; var notebook = userNotebooks.ShareNotebooks[j];
body += tt('<li><a notebookId="?">?</a></li>', notebook.NotebookId, notebook.Title) body += tt('<li><a notebookId="?">?</a></li>', notebook.NotebookId, notebook.Title)
} }
body += "</ul>"; body += "</ul>";
$shareNotebooks.append(header + body + "</div>") $shareNotebooks.append(header + body + "</div>")
} }
} }
// 左侧导航, 选中某个notebook // 左侧导航, 选中某个notebook
@ -846,6 +846,12 @@ $(function() {
} else { } else {
items.push("set2Blog"); items.push("set2Blog");
} }
//asktalk bebug#23
if(notebookId=="548125adf4e872105c000007"){
items.push("delete");
}
// 是否还有笔记 // 是否还有笔记
if(Note.notebookHasNotes(notebookId)) { if(Note.notebookHasNotes(notebookId)) {
items.push("delete"); items.push("delete");