rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3653 from SillyTavern/fix-group-create-tags

Browse Source 
Fix group creation inheriting tags from characters[0]
This commit is contained in:
Cohee
2025-03-10 20:30:23 +02:00
committed by GitHub
parent 1e6f8c6637 a3b2cc456f
commit 13a3f4772e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/scripts/tags.js
View File

@@ -1251,7 +1251,7 @@ function onCharacterCreateClick() {
} }
function onGroupCreateClick() { function onGroupCreateClick() {
// Nothing to do here at the moment. Tags in group interface get automatically redrawn. $('#groupTagList').empty();
} }
export function applyTagsOnCharacterSelect(chid = null) { export function applyTagsOnCharacterSelect(chid = null) {
@@ -1259,11 +1259,11 @@ export function applyTagsOnCharacterSelect(chid = null) {
if (menu_type === 'create') { if (menu_type === 'create') {
const currentTagIds = $('#tagList').find('.tag').map((_, el) => $(el).attr('id')).get(); const currentTagIds = $('#tagList').find('.tag').map((_, el) => $(el).attr('id')).get();
const currentTags = tags.filter(x => currentTagIds.includes(x.id)); const currentTags = tags.filter(x => currentTagIds.includes(x.id));
printTagList($('#tagList'), { forEntityOrKey: null, tags: currentTags, tagOptions: { removable: true } }); printTagList($('#tagList'), { forEntityOrKey: undefined, tags: currentTags, tagOptions: { removable: true } });
return; return;
} }
chid = chid ?? Number(this_chid); chid = chid ?? (this_chid !== undefined ? Number(this_chid) : undefined);
printTagList($('#tagList'), { forEntityOrKey: chid, tagOptions: { removable: true } }); printTagList($('#tagList'), { forEntityOrKey: chid, tagOptions: { removable: true } });
} }
@@ -1272,11 +1272,11 @@ export function applyTagsOnGroupSelect(groupId = null) {
if (menu_type === 'group_create') { if (menu_type === 'group_create') {
const currentTagIds = $('#groupTagList').find('.tag').map((_, el) => $(el).attr('id')).get(); const currentTagIds = $('#groupTagList').find('.tag').map((_, el) => $(el).attr('id')).get();
const currentTags = tags.filter(x => currentTagIds.includes(x.id)); const currentTags = tags.filter(x => currentTagIds.includes(x.id));
printTagList($('#groupTagList'), { forEntityOrKey: null, tags: currentTags, tagOptions: { removable: true } }); printTagList($('#groupTagList'), { forEntityOrKey: undefined, tags: currentTags, tagOptions: { removable: true } });
return; return;
} }
groupId = groupId ?? Number(selected_group); groupId = groupId ?? (selected_group ? Number(selected_group) : undefined);
printTagList($('#groupTagList'), { forEntityOrKey: groupId, tagOptions: { removable: true } }); printTagList($('#groupTagList'), { forEntityOrKey: groupId, tagOptions: { removable: true } });
} }