self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-10-31 00:07:48 +02:00
Code Issues Releases Activity

Api: Resolves #1956: Allow getting the resources of a note

Browse Source
This commit is contained in:
Laurent Cozic
2019-10-07 09:57:24 +02:00
parent 6460907976
commit 60c1939d26
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ReactNativeClient/lib/BaseModel.js
View File

@@ -150,8 +150,8 @@ class BaseModel {
}); });
} }
static load(id) { static load(id, options = null) {
return this.loadByField('id', id); return this.loadByField('id', id, options);
} }
static shortId(id) { static shortId(id) {
@@ -250,7 +250,8 @@ class BaseModel {
static loadByField(fieldName, fieldValue, options = null) { static loadByField(fieldName, fieldValue, options = null) {
if (!options) options = {}; if (!options) options = {};
if (!('caseInsensitive' in options)) options.caseInsensitive = false; if (!('caseInsensitive' in options)) options.caseInsensitive = false;
let sql = `SELECT * FROM \`${this.tableName()}\` WHERE \`${fieldName}\` = ?`; if (!options.fields) options.fields = '*';
let sql = `SELECT ${this.db().escapeFields(options.fields)} FROM \`${this.tableName()}\` WHERE \`${fieldName}\` = ?`;
if (options.caseInsensitive) sql += ' COLLATE NOCASE'; if (options.caseInsensitive) sql += ' COLLATE NOCASE';
return this.modelSelectOne(sql, [fieldValue]); return this.modelSelectOne(sql, [fieldValue]);
} }

16
ReactNativeClient/lib/services/rest/Api.js
View File

@@ -354,12 +354,28 @@ class Api {
return options; return options;
} }
defaultLoadOptions_(request) {
const options = {};
const fields = this.fields_(request, []);
if (fields.length) options.fields = fields;
return options;
}
async action_notes(request, id = null, link = null) { async action_notes(request, id = null, link = null) {
this.checkToken_(request); this.checkToken_(request);
if (request.method === 'GET') { if (request.method === 'GET') {
if (link && link === 'tags') { if (link && link === 'tags') {
return Tag.tagsByNoteId(id); return Tag.tagsByNoteId(id);
} else if (link && link === 'resources') {
const note = await Note.load(id);
const resourceIds = await Note.linkedResourceIds(note.body);
const output = [];
const loadOptions = this.defaultLoadOptions_(request);
for (let resourceId of resourceIds) {
output.push(await Resource.load(resourceId, loadOptions));
}
return output;
} else if (link) { } else if (link) {
throw new ErrorNotFound(); throw new ErrorNotFound();
} }