Emil_Shanaty/open-webui-ai4me
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
parent e214d59d10 8b425a6295
commit a64586f9c2
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/open_webui/models/groups.py
+14 -7
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)
src/lib/components/chat/Messages/Markdown/MarkdownTokens.svelte
+5
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}
/>