self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-06 09:19:22 +02:00
Code Issues Releases Activity

Revert "All: Added support for hierarchical/nested tags (#2572)"

Browse Source 
This reverts commit e11e57f1d8.
This commit is contained in:
Laurent Cozic
2020-07-28 18:50:34 +01:00
parent 89e6b680a6
commit 64d7603eed
31 changed files with 191 additions and 991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -284,67 +284,6 @@ class Api {
}
}
const checkAndRemoveFullTitleField = function(request) {
const fields = this.fields_(request, []);
let hasFullTitleField = false;
for (let i = 0; i < fields.length; i++) {
if (fields[i] === 'full_title') {
hasFullTitleField = true;
// Remove field from field list
fields.splice(i, 1);
break;
}
}
// Remove the full_title field from the query
if (hasFullTitleField) {
if (fields.length > 0) {
request.query.fields = fields.join(',');
} else if (request.query && request.query.fields) {
delete request.query.fields;
}
}
return hasFullTitleField;
}.bind(this);
// Handle full_title for GET requests
const hasFullTitleField = checkAndRemoveFullTitleField(request);
if (hasFullTitleField && request.method === 'GET' && !id) {
let tags = await this.defaultAction_(BaseModel.TYPE_TAG, request, id, link);
tags = tags.map(tag => Object.assign({}, tag, { full_title: Tag.getCachedFullTitle(tag.id) }));
return tags;
}
if (hasFullTitleField && request.method === 'GET' && id) {
let tag = await this.defaultAction_(BaseModel.TYPE_TAG, request, id, link);
tag = Object.assign({}, tag, { full_title: Tag.getCachedFullTitle(tag.id) });
return tag;
}
// Handle full_title for POST and PUT requests
if (request.method === 'PUT' || request.method === 'POST') {
const props = this.readonlyProperties(request.method);
if (props.includes('full_title')) {
if (request.method === 'PUT' && id) {
const model = await Tag.load(id);
if (!model) throw new ErrorNotFound();
let newModel = Object.assign({}, model, request.bodyJson(props));
newModel = await Tag.renameNested(newModel, newModel['full_title']);
return newModel;
}
if (request.method === 'POST') {
const idIdx = props.indexOf('id');
if (idIdx >= 0) props.splice(idIdx, 1);
const model = request.bodyJson(props);
const result = await Tag.saveNested(model, model['full_title'], this.defaultSaveOptions_(model, 'POST'));
return result;
}
}
}
return this.defaultAction_(BaseModel.TYPE_TAG, request, id, link);
}