ti.sil/open-webui
1
0
Fork 0
mirror of https://github.com/open-webui/open-webui.git synced 2025-12-14 13:25:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'dev' of https://github.com/andrewbbaek/open-webui into dev

Browse source
This commit is contained in:
Andrew Baek 2025-08-27 02:57:43 +09:00
commit a64586f9c2
2 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
backend/open_webui/models/groups.py
View file

@ -289,13 +289,16 @@ class GroupTable:
if not group:
return None
if not group.user_ids:
group.user_ids = []
group_user_ids = group.user_ids
if not group_user_ids or not isinstance(group_user_ids, list):
group_user_ids = []
for user_id in user_ids:
if user_id not in group.user_ids:
group.user_ids.append(user_id)
if user_id not in group_user_ids:
group_user_ids.append(user_id)
group.user_ids = group_user_ids
group.updated_at = int(time.time())
db.commit()
db.refresh(group)
@ -313,14 +316,18 @@ class GroupTable:
if not group:
return None
if not group.user_ids:
group_user_ids = group.user_ids
if not group_user_ids or not isinstance(group_user_ids, list):
return GroupModel.model_validate(group)
for user_id in user_ids:
if user_id in group.user_ids:
group.user_ids.remove(user_id)
if user_id in group_user_ids:
group_user_ids.remove(user_id)
group.user_ids = group_user_ids
group.updated_at = int(time.time())
db.commit()
db.refresh(group)
return GroupModel.model_validate(group)

5
src/lib/components/chat/Messages/Markdown/MarkdownTokens.svelte
View file

@ -201,6 +201,7 @@
id={`${id}-${tokenIdx}`}
tokens={token.tokens}
{done}
{editCodeBlock}
{onTaskClick}
{onSourceClick}
/>
@ -234,6 +235,7 @@
tokens={item.tokens}
top={token.loose}
{done}
{editCodeBlock}
{onTaskClick}
{onSourceClick}
/>
@ -267,6 +269,7 @@
tokens={item.tokens}
top={token.loose}
{done}
{editCodeBlock}
{onTaskClick}
{onSourceClick}
/>
@ -277,6 +280,7 @@
tokens={item.tokens}
top={token.loose}
{done}
{editCodeBlock}
{onTaskClick}
{onSourceClick}
/>
@ -299,6 +303,7 @@
tokens={marked.lexer(token.text)}
attributes={token?.attributes}
{done}
{editCodeBlock}
{onTaskClick}
{onSourceClick}
/>