mirror of
https://github.com/hcengineering/platform.git
synced 2025-05-14 03:10:27 +00:00
Guest always should knock to join the meeting (#8501)
Some checks are pending
CI / uitest (push) Waiting to run
CI / uitest-pg (push) Waiting to run
CI / uitest-qms (push) Waiting to run
CI / uitest-workspaces (push) Waiting to run
CI / docker-build (push) Blocked by required conditions
CI / dist-build (push) Blocked by required conditions
CI / build (push) Waiting to run
CI / svelte-check (push) Blocked by required conditions
CI / formatting (push) Blocked by required conditions
CI / test (push) Blocked by required conditions
Some checks are pending
CI / uitest (push) Waiting to run
CI / uitest-pg (push) Waiting to run
CI / uitest-qms (push) Waiting to run
CI / uitest-workspaces (push) Waiting to run
CI / docker-build (push) Blocked by required conditions
CI / dist-build (push) Blocked by required conditions
CI / build (push) Waiting to run
CI / svelte-check (push) Blocked by required conditions
CI / formatting (push) Blocked by required conditions
CI / test (push) Blocked by required conditions
Signed-off-by: Nikolay Chunosov <Chunosov.N@gmail.com>
This commit is contained in:
parent
17f0aedaf6
commit
420b31d66f
@ -3,7 +3,7 @@ import { connectMeeting, disconnectMeeting } from '@hcengineering/ai-bot-resourc
|
|||||||
import { Analytics } from '@hcengineering/analytics'
|
import { Analytics } from '@hcengineering/analytics'
|
||||||
import calendar, { type Event, getAllEvents } from '@hcengineering/calendar'
|
import calendar, { type Event, getAllEvents } from '@hcengineering/calendar'
|
||||||
import chunter from '@hcengineering/chunter'
|
import chunter from '@hcengineering/chunter'
|
||||||
import contact, { getCurrentEmployee, getName, type Person } from '@hcengineering/contact'
|
import contact, { type Employee, getCurrentEmployee, getName, type Person } from '@hcengineering/contact'
|
||||||
import { personByIdStore } from '@hcengineering/contact-resources'
|
import { personByIdStore } from '@hcengineering/contact-resources'
|
||||||
import core, {
|
import core, {
|
||||||
AccountRole,
|
AccountRole,
|
||||||
@ -869,7 +869,9 @@ export async function tryConnect (
|
|||||||
for (const invite of currentInvites) {
|
for (const invite of currentInvites) {
|
||||||
await client.update(invite, { status: invite.room === room._id ? RequestStatus.Approved : RequestStatus.Rejected })
|
await client.update(invite, { status: invite.room === room._id ? RequestStatus.Approved : RequestStatus.Rejected })
|
||||||
}
|
}
|
||||||
if (room.access === RoomAccess.Knock && (!isOffice(room) || room.person !== currentPerson._id)) {
|
|
||||||
|
const isGuest = (currentPerson as Employee).role === AccountRole.Guest
|
||||||
|
if ((room.access === RoomAccess.Knock || isGuest) && (!isOffice(room) || room.person !== currentPerson._id)) {
|
||||||
const _id = await client.createDoc(love.class.JoinRequest, core.space.Workspace, {
|
const _id = await client.createDoc(love.class.JoinRequest, core.space.Workspace, {
|
||||||
person: currentPerson._id,
|
person: currentPerson._id,
|
||||||
room: room._id,
|
room: room._id,
|
||||||
|
Loading…
Reference in New Issue
Block a user