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

refac

Browse source
This commit is contained in:
Timothy Jaeryang Baek 2025-11-25 04:45:52 -05:00
parent e6d8f89850
commit 84ca2258be
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
backend/open_webui/models/users.py
View file

@ -249,10 +249,16 @@ class UsersTable:
) )
user_ids = filter.get("user_ids") user_ids = filter.get("user_ids")
group_ids = filter.get("group_ids")
if isinstance(user_ids, list) and isinstance(group_ids, list):
# If both are empty lists, return no users
if not user_ids and not group_ids:
return {"users": [], "total": 0}
if user_ids: if user_ids:
query = query.filter(User.id.in_(user_ids)) query = query.filter(User.id.in_(user_ids))
group_ids = filter.get("group_ids")
if group_ids: if group_ids:
query = query.filter( query = query.filter(
exists( exists(

6
backend/open_webui/routers/channels.py
View file

@ -166,10 +166,8 @@ async def get_channel_users_by_id(
permitted_ids = get_permitted_group_and_user_ids("read", channel.access_control) permitted_ids = get_permitted_group_and_user_ids("read", channel.access_control)
if permitted_ids: if permitted_ids:
if permitted_ids.get("user_ids"): filter["user_ids"] = permitted_ids.get("user_ids")
filter["user_ids"] = permitted_ids.get("user_ids") filter["group_ids"] = permitted_ids.get("group_ids")
if permitted_ids.get("group_ids"):
filter["group_ids"] = permitted_ids.get("group_ids")
result = Users.get_users(filter=filter, skip=skip, limit=limit) result = Users.get_users(filter=filter, skip=skip, limit=limit)

7
src/lib/components/channel/ChannelInfoModal/UserList.svelte
View file

@ -93,7 +93,7 @@
<div class="my-10"> <div class="my-10">
<Spinner className="size-5" /> <Spinner className="size-5" />
</div> </div>
{:else} {:else if users.length > 0}
<div class="flex gap-1"> <div class="flex gap-1">
<div class=" flex w-full space-x-2"> <div class=" flex w-full space-x-2">
<div class="flex flex-1"> <div class="flex flex-1">
@ -119,7 +119,6 @@
</div> </div>
</div> </div>
</div> </div>
<div class="scrollbar-hidden relative whitespace-nowrap w-full max-w-full"> <div class="scrollbar-hidden relative whitespace-nowrap w-full max-w-full">
<div class=" text-sm text-left text-gray-500 dark:text-gray-400 w-full max-w-full"> <div class=" text-sm text-left text-gray-500 dark:text-gray-400 w-full max-w-full">
<div <div
@ -226,5 +225,9 @@
{#if total > 30} {#if total > 30}
<Pagination bind:page count={total} perPage={30} /> <Pagination bind:page count={total} perPage={30} />
{/if} {/if}
{:else}
<div class="text-gray-500 text-xs text-center py-5 px-10">
{$i18n.t('No users were found.')}
</div>
{/if} {/if}
</div> </div>