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

Fixed limit issue

Browse Source
This commit is contained in:
Laurent Cozic
2017-08-20 10:16:31 +02:00
parent d708c8b48d
commit 1213819467
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CliClient/run.sh
View File

@ -2,6 +2,5 @@
set -e set -e
CLIENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" CLIENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
#bash $CLIENT_DIR/build.sh && NODE_PATH="$CLIENT_DIR/build/" node build/main.js --profile ~/Temp/TestNotes2 --stack-trace-enabled --log-level debug --env dev "$@" bash $CLIENT_DIR/build.sh && NODE_PATH="$CLIENT_DIR/build/" node build/main.js --profile ~/Temp/TestNotes2 --stack-trace-enabled --log-level debug --env dev "$@"
#bash $CLIENT_DIR/build.sh && NODE_PATH="$CLIENT_DIR/build/" node build/main.js --stack-trace-enabled --log-level debug "$@"
bash $CLIENT_DIR/build.sh && NODE_PATH="$CLIENT_DIR/build/" node build/main.js --stack-trace-enabled --log-level debug "$@"

2
ReactNativeClient/lib/base-model.js
View File

@ -151,6 +151,8 @@ class BaseModel {
params.push(pattern); params.push(pattern);
} }
if ('limit' in options && options.limit <= 0) return [];
let sql = 'SELECT ' + this.db().escapeFields(options.fields) + ' FROM `' + this.tableName() + '`'; let sql = 'SELECT ' + this.db().escapeFields(options.fields) + ' FROM `' + this.tableName() + '`';
if (conditions.length) sql += ' WHERE ' + conditions.join(' AND '); if (conditions.length) sql += ' WHERE ' + conditions.join(' AND ');

1
ReactNativeClient/lib/models/note.js
View File

@ -165,6 +165,7 @@ class Note extends BaseItem {
tempOptions = Object.assign({}, options); tempOptions = Object.assign({}, options);
tempOptions.conditions = cond; tempOptions.conditions = cond;
if ('limit' in tempOptions) tempOptions.limit -= uncompletedTodos.length;
let theRest = await this.search(tempOptions); let theRest = await this.search(tempOptions);
return uncompletedTodos.concat(theRest); return uncompletedTodos.concat(theRest);