self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00
Code Issues Releases Activity

Desktop: Resolves #262: Implement "show all notes" (#2472)

Browse Source 
* Implement "show all notes" feature.

* Ensure middleware is completely flushed and shutdown before continuing tests.
This commit is contained in:
mic704b
2020-02-22 22:25:16 +11:00
committed by GitHub
parent 0f28060795
commit fbedc6b29b
15 changed files with 344 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ReactNativeClient/lib/models/Note.js
View File

@ -12,6 +12,7 @@ const ArrayUtils = require('lib/ArrayUtils.js');
const lodash = require('lodash');
const urlUtils = require('lib/urlUtils.js');
const { MarkupToHtml } = require('lib/joplin-renderer');
const { ALL_NOTES_FILTER_ID } = require('lib/reserved-ids');
class Note extends BaseItem {
static tableName() {
@ -275,7 +276,7 @@ class Note extends BaseItem {
options.conditions.push('is_conflict = 1');
} else {
options.conditions.push('is_conflict = 0');
if (parentId) {
if (parentId && parentId !== ALL_NOTES_FILTER_ID) {
options.conditions.push('parent_id = ?');
options.conditionsParams.push(parentId);
}