Sync email team invites, meeting room fixes, Afia, and org settings.
Deploy Ladill Meet / deploy (push) Successful in 47s
Deploy Ladill Meet / deploy (push) Successful in 47s
Publish monorepo meet changes: identity API invites, join/room session fixes, Afia assistant panel, settings nav, and SSO team provisioning. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -172,7 +172,11 @@ class RoomController extends Controller
|
||||
{
|
||||
$this->authorizeAbility($request, 'meetings.host');
|
||||
$this->authorizeOwner($request, $room);
|
||||
abort_if($room->status === 'cancelled', 422, 'Meeting was cancelled.');
|
||||
|
||||
if ($room->status === 'cancelled') {
|
||||
return redirect()->route('meet.rooms.show', $room)
|
||||
->withErrors(['start' => 'Meeting was cancelled.']);
|
||||
}
|
||||
|
||||
if ($room->isTownHall() && $room->setting('green_room')) {
|
||||
$session = app(\App\Services\Meet\TownHallService::class)->startGreenRoom($room, $request->user());
|
||||
@@ -180,6 +184,11 @@ class RoomController extends Controller
|
||||
$session = $this->sessions->start($room, $request->user());
|
||||
}
|
||||
|
||||
$participant = $this->sessions->joinedParticipantForUser($session, $request->user());
|
||||
abort_unless($participant, 500, 'Unable to join as host.');
|
||||
|
||||
$this->sessions->rememberParticipantSession($request, $participant, $session);
|
||||
|
||||
return redirect()->route('meet.room', $session);
|
||||
}
|
||||
|
||||
@@ -204,6 +213,11 @@ class RoomController extends Controller
|
||||
|
||||
$session = $this->sessions->start($room, $request->user());
|
||||
|
||||
$participant = $this->sessions->joinedParticipantForUser($session, $request->user());
|
||||
abort_unless($participant, 500, 'Unable to join as host.');
|
||||
|
||||
$this->sessions->rememberParticipantSession($request, $participant, $session);
|
||||
|
||||
return redirect()->route('meet.room', $session);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user