From 80886e82017b8e57ce1f589d399deb2ceb7cfd9f Mon Sep 17 00:00:00 2001 From: Anton Alexeyev Date: Tue, 30 Sep 2025 18:39:31 +0700 Subject: [PATCH] Skip meeting participants in invite list (#9981) Signed-off-by: Anton Alexeyev --- .../contact-resources/src/components/SelectUsersPopup.svelte | 2 ++ plugins/contact-resources/src/components/UsersList.svelte | 3 ++- .../components/meeting/invites/InviteEmployeeButton.svelte | 5 ++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/plugins/contact-resources/src/components/SelectUsersPopup.svelte b/plugins/contact-resources/src/components/SelectUsersPopup.svelte index 29a2bb38ee..eabb667f25 100644 --- a/plugins/contact-resources/src/components/SelectUsersPopup.svelte +++ b/plugins/contact-resources/src/components/SelectUsersPopup.svelte @@ -31,6 +31,7 @@ export let placeholder: IntlString = presentation.string.Search export let selected: Ref[] = [] export let skipCurrentAccount = false + export let skipAccounts: Ref[] = [] export let disableDeselectFor: Ref[] = [] export let showStatus = true export let skipInactive = false @@ -91,6 +92,7 @@ {showStatus} {disableDeselectFor} {skipCurrentAccount} + {skipAccounts} {skipInactive} on:select={handleSelectionChanged} /> diff --git a/plugins/contact-resources/src/components/UsersList.svelte b/plugins/contact-resources/src/components/UsersList.svelte index 339c211a4e..217da8a6d9 100644 --- a/plugins/contact-resources/src/components/UsersList.svelte +++ b/plugins/contact-resources/src/components/UsersList.svelte @@ -28,6 +28,7 @@ export let search: string = '' export let selected: Ref[] = [] export let skipCurrentAccount = false + export let skipAccounts: Ref[] = [] export let disableDeselectFor: Ref[] = [] export let showStatus = true export let skipInactive = false @@ -52,7 +53,7 @@ ? { $search: search } : { [searchField]: { $like: '%' + search + '%' } } : {}), - ...(skipCurrentAccount ? { _id: { $ne: me } } : {}), + ...{ _id: { $nin: skipCurrentAccount ? [...skipAccounts, me] : [...skipAccounts] } }, ...(skipInactive ? { active: true } : {}), ...(skipOnlyLocal ? { personUuid: { $exists: true } } : {}) }, diff --git a/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte b/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte index 06f626ae38..67b1215230 100644 --- a/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte +++ b/plugins/love-resources/src/components/meeting/invites/InviteEmployeeButton.svelte @@ -15,11 +15,12 @@