aboutsummaryrefslogtreecommitdiff
path: root/client/js/models
diff options
context:
space:
mode:
authorrr-2017-03-04 16:55:53 +0100
committerrr-2017-03-04 16:55:53 +0100
commit49feb932f35fbc5bdb6b09eb3f881a7c9df1e3ab (patch)
treee65dff331015a7bc4da99e61a925db8894f7bb9d /client/js/models
parent5681fd11efe93b5b2a1719f16c9f253ffd508842 (diff)
client/tags: merging can now also add aliases
Diffstat (limited to 'client/js/models')
-rw-r--r--client/js/models/tag.js10
1 files changed, 9 insertions, 1 deletions
diff --git a/client/js/models/tag.js b/client/js/models/tag.js
index 1a15693..ccfe6b2 100644
--- a/client/js/models/tag.js
+++ b/client/js/models/tag.js
@@ -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'), {
@@ -85,6 +85,14 @@ class Tag extends events.EventTarget {
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', {
detail: {

© 2015 - 2026 Jakob L. Kreuze