Route webinar and conference registration through Ladill Events.
Deploy Ladill Meet / deploy (push) Successful in 1m26s
Deploy Ladill Meet / deploy (push) Successful in 1m26s
Add Events linking UI and service client, remove Meet-native registration and invitation flows for these room types, and redirect attendees to Events registration when joining. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
@@ -52,15 +52,8 @@ class ConferenceController extends Controller
|
||||
$this->authorizeAbility($request, 'meetings.create');
|
||||
$organization = $this->organization($request);
|
||||
|
||||
$members = Member::owned($this->ownerRef($request))
|
||||
->where('organization_id', $organization->id)
|
||||
->where('user_ref', '!=', $this->ownerRef($request))
|
||||
->orderBy('user_ref')
|
||||
->get();
|
||||
|
||||
return view('meet.conferences.create', [
|
||||
'organization' => $organization,
|
||||
'members' => $members,
|
||||
'timezones' => timezone_identifiers_list(),
|
||||
'defaultSettings' => config('meet.default_settings'),
|
||||
]);
|
||||
@@ -78,9 +71,6 @@ class ConferenceController extends Controller
|
||||
'duration_minutes' => ['nullable', 'integer', 'min:15', 'max:480'],
|
||||
'timezone' => ['nullable', 'timezone'],
|
||||
'passcode' => ['nullable', 'string', 'max:20'],
|
||||
'invite_emails' => ['nullable', 'string'],
|
||||
'presenter_refs' => ['nullable', 'array'],
|
||||
'presenter_refs.*' => ['string', 'max:64'],
|
||||
'waiting_room' => ['sometimes', 'boolean'],
|
||||
'join_before_host' => ['sometimes', 'boolean'],
|
||||
'mute_on_join' => ['sometimes', 'boolean'],
|
||||
@@ -91,12 +81,6 @@ class ConferenceController extends Controller
|
||||
'panel_discussions' => ['sometimes', 'boolean'],
|
||||
]);
|
||||
|
||||
$presenterRefs = collect($validated['presenter_refs'] ?? [])
|
||||
->filter()
|
||||
->unique()
|
||||
->values()
|
||||
->all();
|
||||
|
||||
$settings = [
|
||||
'waiting_room' => $request->boolean('waiting_room', true),
|
||||
'join_before_host' => $request->boolean('join_before_host'),
|
||||
@@ -109,7 +93,7 @@ class ConferenceController extends Controller
|
||||
'stage_layout' => 'plenary',
|
||||
'panels' => [],
|
||||
'stage_mode' => true,
|
||||
'presenter_refs' => $presenterRefs,
|
||||
'presenter_refs' => [],
|
||||
];
|
||||
|
||||
$data = array_merge($validated, [
|
||||
@@ -121,14 +105,6 @@ class ConferenceController extends Controller
|
||||
|
||||
$room = $this->rooms->create($request->user(), $organization, $data);
|
||||
|
||||
if ($emails = trim((string) ($validated['invite_emails'] ?? ''))) {
|
||||
$invites = collect(preg_split('/[\s,;]+/', $emails))
|
||||
->filter()
|
||||
->map(fn ($email) => ['email' => $email, 'role' => 'panelist'])
|
||||
->all();
|
||||
$this->invitations->inviteToRoom($room, $invites, $request->user());
|
||||
}
|
||||
|
||||
if ($room->scheduled_at) {
|
||||
$this->calendar->syncRoomCreated($room, $request->user());
|
||||
}
|
||||
@@ -144,43 +120,7 @@ class ConferenceController extends Controller
|
||||
|
||||
$room->load(['sessions.participants', 'invitations', 'sessions.recordings', 'sessions.aiSummaries', 'sessionFiles']);
|
||||
|
||||
$presenterRefs = $this->conferences->presenterRefs($room);
|
||||
$speakers = Member::owned($this->ownerRef($request))
|
||||
->where('organization_id', $room->organization_id)
|
||||
->whereIn('user_ref', $presenterRefs)
|
||||
->get();
|
||||
|
||||
$speakerUsers = User::query()
|
||||
->whereIn('public_id', $presenterRefs)
|
||||
->get()
|
||||
->keyBy('public_id');
|
||||
|
||||
$members = Member::owned($this->ownerRef($request))
|
||||
->where('organization_id', $room->organization_id)
|
||||
->where('user_ref', '!=', $this->ownerRef($request))
|
||||
->orderBy('user_ref')
|
||||
->get();
|
||||
|
||||
$memberUsers = User::query()
|
||||
->whereIn('public_id', $members->pluck('user_ref'))
|
||||
->get()
|
||||
->keyBy('public_id');
|
||||
|
||||
$canManageSpeakers = app(\App\Services\Meet\MeetPermissions::class)
|
||||
->can($this->member($request), 'meetings.manage');
|
||||
|
||||
$eventsEventUrl = \App\Support\EventsSourceLink::eventAdminUrl($room);
|
||||
|
||||
return view('meet.conferences.show', compact(
|
||||
'room',
|
||||
'speakers',
|
||||
'speakerUsers',
|
||||
'members',
|
||||
'memberUsers',
|
||||
'presenterRefs',
|
||||
'canManageSpeakers',
|
||||
'eventsEventUrl',
|
||||
));
|
||||
return view('meet.conferences.show', compact('room'));
|
||||
}
|
||||
|
||||
public function updateSpeakers(Request $request, Room $room): RedirectResponse
|
||||
@@ -189,6 +129,17 @@ class ConferenceController extends Controller
|
||||
$this->authorizeOwner($request, $room);
|
||||
abort_unless($room->isConference(), 404);
|
||||
|
||||
if ($room->isEventsLinked()) {
|
||||
if ($request->has('panel_discussions')) {
|
||||
$settings = array_merge($room->settings ?? [], [
|
||||
'panel_discussions' => $request->boolean('panel_discussions'),
|
||||
]);
|
||||
$room->update(['settings' => $settings]);
|
||||
}
|
||||
|
||||
return redirect()->route('meet.conferences.show', $room)->with('success', 'Conference settings updated.');
|
||||
}
|
||||
|
||||
$validated = $request->validate([
|
||||
'presenter_refs' => ['nullable', 'array'],
|
||||
'presenter_refs.*' => ['string', 'max:64'],
|
||||
|
||||
Reference in New Issue
Block a user