Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 16:46:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #8982, copy color on tag rename, dont copy if target exists

Browse Source 
refresh page on tag rename
This commit is contained in:
Barış Soner Uşaklı
2020-11-27 16:36:23 -05:00
parent 77a6dbacc4
commit d3c04afb98
3 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
public/language/en-GB/admin/manage/tags.json
View File

@@ -14,5 +14,6 @@
"alerts.editing": "Editing tag(s)", "alerts.editing": "Editing tag(s)",
"alerts.confirm-delete": "Do you want to delete the selected tags?", "alerts.confirm-delete": "Do you want to delete the selected tags?",
"alerts.update-success": "Tag Updated!" "alerts.update-success": "Tag Updated!",
"reset-colors": "Reset colors"
} }

1
public/src/admin/manage/tags.js
View File

@@ -159,6 +159,7 @@ define('admin/manage/tags', [
return app.alertError(err.message); return app.alertError(err.message);
} }
app.alertSuccess('[[admin/manage/tags:alerts.update-success]]'); app.alertSuccess('[[admin/manage/tags:alerts.update-success]]');
ajaxify.refresh();
}); });
}, },
}, },

9
src/topics/tags.js
View File

@@ -90,6 +90,15 @@ module.exports = function (Topics) {
} }
newTagName = utils.cleanUpTag(newTagName, meta.config.maximumTagLength); newTagName = utils.cleanUpTag(newTagName, meta.config.maximumTagLength);
await Topics.createEmptyTag(newTagName); await Topics.createEmptyTag(newTagName);
const targetExists = await db.isSortedSetMember('tags:topic:count', newTagName);
const tagData = await db.getObject('tag:' + tag);
if (tagData && !targetExists) {
await db.setObject('tag:' + newTagName, {
color: tagData.color,
bgColor: tagData.bgColor,
});
}
await batch.processSortedSet('tag:' + tag + ':topics', async function (tids) { await batch.processSortedSet('tag:' + tag + ':topics', async function (tids) {
const scores = await db.sortedSetScores('tag:' + tag + ':topics', tids); const scores = await db.sortedSetScores('tag:' + tag + ':topics', tids);
await db.sortedSetAdd('tag:' + newTagName + ':topics', scores, tids); await db.sortedSetAdd('tag:' + newTagName + ':topics', scores, tids);