scl/szurubooru
1
0
Fork 0
mirror of https://github.com/rr-/szurubooru.git synced 2025-07-17 08:26:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

client/tags: merging can now also add aliases

Browse Source
This commit is contained in:
rr-
2017-03-04 16:55:53 +01:00
parent 5681fd11ef
commit 49feb932f3
4 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
client/js/controllers/tag_controller.js
View File

@ -97,16 +97,19 @@ class TagController {
_evtMerge(e) {
this._view.clearMessages();
this._view.disableForm();
e.detail.tag.merge(e.detail.targetTagName).then(() => {
this._view.showSuccess('Tag merged.');
this._view.enableForm();
router.replace(
uri.formatClientLink('tag', e.detail.targetTagName, 'merge'),
null, false);
}, error => {
this._view.showError(error.message);
this._view.enableForm();
});
e.detail.tag
.merge(e.detail.targetTagName, e.detail.addAlias)
.then(() => {
this._view.showSuccess('Tag merged.');
this._view.enableForm();
router.replace(
uri.formatClientLink(
'tag', e.detail.targetTagName, 'merge'),
null, false);
}, error => {
this._view.showError(error.message);
this._view.enableForm();
});
}
_evtDelete(e) {

10
client/js/models/tag.js
View File

@ -75,7 +75,7 @@ class Tag extends events.EventTarget {
});
}
merge(targetName) {
merge(targetName, addAlias) {
return api.get(uri.formatApiLink('tag', targetName))
.then(response => {
return api.post(uri.formatApiLink('tag-merge'), {
@ -84,6 +84,14 @@ class Tag extends events.EventTarget {
mergeToVersion: response.version,
mergeTo: targetName,
});
}).then(response => {
if (!addAlias) {
return Promise.resolve(response);
}
return api.put(uri.formatApiLink('tag', targetName), {
version: response.version,
names: response.names.concat(this._names),
});
}).then(response => {
this._updateFromResponse(response);
this.dispatchEvent(new CustomEvent('change', {

7
client/js/views/tag_merge_view.js
View File

@ -51,6 +51,7 @@ class TagMergeView extends events.EventTarget {
detail: {
tag: this._tag,
targetTagName: this._targetTagFieldNode.value,
addAlias: this._addAliasCheckboxNode.checked,
},
}));
}
@ -60,7 +61,11 @@ class TagMergeView extends events.EventTarget {
}
get _targetTagFieldNode() {
return this._formNode.querySelector('.target input');
return this._formNode.querySelector('input[name=target-tag]');
}
get _addAliasCheckboxNode() {
return this._formNode.querySelector('input[name=alias]');
}
}