leanote/desktop-app
1
0
Fork 0
mirror of https://github.com/leanote/desktop-app.git synced 2025-10-15 07:31:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

conflict fixed

Browse Source
This commit is contained in:
life
2015-02-13 11:43:49 +08:00
parent faeb923b2a
commit ec4841a59d
6 changed files with 98 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
node_modules/note.js generated vendored
View File

@@ -242,6 +242,11 @@ var Note = {
});
},
conflictIsFixed: function(noteId) {
var me = this;
Notes.update({NoteId: noteId}, {$set: {ConflictNoteId: ""}});
},
// 笔记本下是否有笔记
hasNotes: function(notebookId, callback) {
Notes.count({NotebookId: notebookId, IsTrash: false, LocalIsDelete: false}, function(err, n) {