Bugfix Batch
* Animations disabled on remote events, closing note still triggers animation for local user * Created save icons to fix display on mobile * Hidden URLs are hidden until note is deleted or URL is removed from note * Tags search all categories, but probably not trash * Back to all notes button clears search * Deleted Notes are removed from search index
This commit is contained in:
1 parent
5096e74a60
commit
543ecf0f2d
8 files changed
+58
-45
No files matched your search
+17
-4
@@ -299,7 +299,7 @@ Note.reindex = (userId, masterKey, removeId = null) => {
|
||||
return db.promise().query(`
|
||||
SELECT note.id, text, salt, encrypted_share_password_key FROM note
|
||||
JOIN note_raw_text ON note.note_raw_text_id = note_raw_text.id
|
||||
WHERE indexed = 0 AND salt IS NOT NULL
|
||||
WHERE indexed = 0 AND salt IS NOT NULL AND trashed = 0
|
||||
AND user_id = ? LIMIT 100`, [userId])
|
||||
|
||||
})
|
||||
@@ -610,7 +610,7 @@ Note.setArchived = (userId, noteId, archivedBoolead) => {
|
||||
})
|
||||
}
|
||||
|
||||
Note.setTrashed = (userId, noteId, trashedBoolean) => {
|
||||
Note.setTrashed = (userId, noteId, trashedBoolean, masterKey) => {
|
||||
return new Promise((resolve, reject) => {
|
||||
|
||||
const trashed = trashedBoolean ? 1:0
|
||||
@@ -618,9 +618,18 @@ Note.setTrashed = (userId, noteId, trashedBoolean) => {
|
||||
|
||||
//Update other note attributes
|
||||
return db.promise()
|
||||
.query('UPDATE note JOIN note_raw_text ON note_raw_text_id = note_raw_text.id SET trashed = ?, updated = ? WHERE note.id = ? AND user_id = ?',
|
||||
.query('UPDATE note JOIN note_raw_text ON note_raw_text_id = note_raw_text.id SET trashed = ?, updated = ?, indexed = 0 WHERE note.id = ? AND user_id = ?',
|
||||
[trashed, now, noteId, userId])
|
||||
.then((rows, fields) => {
|
||||
|
||||
const removeFromIndex = []
|
||||
if(trashed){
|
||||
//Remove note from index
|
||||
removeFromIndex.push(noteId)
|
||||
}
|
||||
Note.reindex(userId, masterKey, removeFromIndex)
|
||||
|
||||
|
||||
SocketIo.to(userId).emit('note_attribute_modified', noteId)
|
||||
resolve(true)
|
||||
})
|
||||
@@ -1016,12 +1025,16 @@ Note.search = (userId, searchQuery, searchTags, fastFilters, masterKey) => {
|
||||
//If tags are passed, use those tags in search
|
||||
if(searchTags.length > 0){
|
||||
searchParams.push(searchTags)
|
||||
noteSearchQuery += ' AND note_tag.tag_id IN (?)'
|
||||
noteSearchQuery += ' AND note_tag.tag_id IN (?) AND note.trashed = 0'
|
||||
searchAllNotes = true
|
||||
}
|
||||
|
||||
|
||||
|
||||
//Show archived notes, only if fast filter is set, default to not archived
|
||||
if(searchAllNotes == false){
|
||||
|
||||
//Default set of filters for all notes
|
||||
if(fastFilters.notesHome == 1){
|
||||
noteSearchQuery += ' AND note.archived = 0 AND note.trashed = 0 AND note.share_user_id IS NULL'
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user