Remove meeting templates and show Events programme on Meet rooms.
Deploy Ladill Meet / deploy (push) Successful in 42s

Templates duplicated create-form settings without edit/delete flows; drop the feature and table. Conference and webinar pages render synced programme snapshots and link back to Ladill Events.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
isaacclad
2026-07-01 22:31:03 +00:00
co-authored by Cursor
parent c108514b27
commit aed7094fed
25 changed files with 152 additions and 336 deletions
@@ -6,14 +6,12 @@ use App\Http\Controllers\Controller;
use App\Http\Controllers\Meet\Concerns\ScopesToAccount;
use App\Models\Member;
use App\Models\Room;
use App\Models\Template;
use App\Models\User;
use App\Services\Meet\CalendarService;
use App\Services\Meet\ConferenceService;
use App\Services\Meet\InvitationService;
use App\Services\Meet\RoomService;
use App\Services\Meet\SessionService;
use App\Services\Meet\TemplateService;
use App\Services\Meet\TownHallService;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
@@ -26,7 +24,6 @@ class ConferenceController extends Controller
public function __construct(
protected RoomService $rooms,
protected SessionService $sessions,
protected TemplateService $templates,
protected InvitationService $invitations,
protected CalendarService $calendar,
protected TownHallService $townHalls,
@@ -55,11 +52,6 @@ class ConferenceController extends Controller
$this->authorizeAbility($request, 'meetings.create');
$organization = $this->organization($request);
$templates = Template::owned($this->ownerRef($request))
->where('organization_id', $organization->id)
->orderBy('name')
->get();
$members = Member::owned($this->ownerRef($request))
->where('organization_id', $organization->id)
->where('user_ref', '!=', $this->ownerRef($request))
@@ -68,7 +60,6 @@ class ConferenceController extends Controller
return view('meet.conferences.create', [
'organization' => $organization,
'templates' => $templates,
'members' => $members,
'timezones' => timezone_identifiers_list(),
'defaultSettings' => config('meet.default_settings'),
@@ -87,7 +78,6 @@ class ConferenceController extends Controller
'duration_minutes' => ['nullable', 'integer', 'min:15', 'max:480'],
'timezone' => ['nullable', 'timezone'],
'passcode' => ['nullable', 'string', 'max:20'],
'template_id' => ['nullable', 'integer', 'exists:meet_templates,id'],
'invite_emails' => ['nullable', 'string'],
'presenter_refs' => ['nullable', 'array'],
'presenter_refs.*' => ['string', 'max:64'],
@@ -129,11 +119,6 @@ class ConferenceController extends Controller
'status' => 'scheduled',
]);
if (! empty($validated['template_id'])) {
$template = Template::findOrFail($validated['template_id']);
$data = $this->templates->applyToRoomData($template, $data);
}
$room = $this->rooms->create($request->user(), $organization, $data);
if ($emails = trim((string) ($validated['invite_emails'] ?? ''))) {
@@ -184,6 +169,8 @@ class ConferenceController extends Controller
$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',
@@ -192,6 +179,7 @@ class ConferenceController extends Controller
'memberUsers',
'presenterRefs',
'canManageSpeakers',
'eventsEventUrl',
));
}
@@ -5,7 +5,6 @@ namespace App\Http\Controllers\Meet;
use App\Http\Controllers\Controller;
use App\Http\Controllers\Meet\Concerns\ScopesToAccount;
use App\Models\Room;
use App\Models\Template;
use App\Services\Meet\AttendanceService;
use App\Services\Meet\AvailabilityService;
use App\Services\Meet\CalendarService;
@@ -14,7 +13,6 @@ use App\Services\Meet\InvitationService;
use App\Services\Meet\RecurringMeetingService;
use App\Services\Meet\RoomService;
use App\Services\Meet\SessionService;
use App\Services\Meet\TemplateService;
use chillerlan\QRCode\QRCode;
use chillerlan\QRCode\QROptions;
use Illuminate\Http\RedirectResponse;
@@ -29,7 +27,6 @@ class RoomController extends Controller
public function __construct(
protected RoomService $rooms,
protected SessionService $sessions,
protected TemplateService $templates,
protected RecurringMeetingService $recurring,
protected InvitationService $invitations,
protected CalendarService $calendar,
@@ -58,14 +55,8 @@ class RoomController extends Controller
$this->authorizeAbility($request, 'meetings.create');
$organization = $this->organization($request);
$templates = Template::owned($this->ownerRef($request))
->where('organization_id', $organization->id)
->orderBy('name')
->get();
return view('meet.rooms.create', [
'organization' => $organization,
'templates' => $templates,
'timezones' => timezone_identifiers_list(),
'recurrenceRules' => config('meet.recurrence_rules'),
'defaultSettings' => config('meet.default_settings'),
@@ -85,7 +76,6 @@ class RoomController extends Controller
'duration_minutes' => ['nullable', 'integer', 'min:15', 'max:480'],
'timezone' => ['nullable', 'timezone'],
'passcode' => ['nullable', 'string', 'max:20'],
'template_id' => ['nullable', 'integer', 'exists:meet_templates,id'],
'recurrence_rule' => ['nullable', 'string', 'in:'.implode(',', array_keys(config('meet.recurrence_rules')))],
'recurrence_interval' => ['nullable', 'integer', 'min:1', 'max:12'],
'recurrence_until' => ['nullable', 'date'],
@@ -113,11 +103,6 @@ class RoomController extends Controller
'timezone' => $validated['timezone'] ?? $organization->timezone,
]);
if (! empty($validated['template_id'])) {
$template = Template::findOrFail($validated['template_id']);
$data = $this->templates->applyToRoomData($template, $data);
}
$isInstant = empty($validated['scheduled_at']);
if (! empty($validated['recurrence_rule']) && ! $isInstant) {
@@ -6,13 +6,11 @@ use App\Http\Controllers\Controller;
use App\Http\Controllers\Meet\Concerns\ScopesToAccount;
use App\Models\Member;
use App\Models\Room;
use App\Models\Template;
use App\Services\Meet\CalendarService;
use App\Services\Meet\InvitationService;
use App\Services\Meet\RoomService;
use App\Services\Meet\SessionService;
use App\Services\Meet\SpaceService;
use App\Services\Meet\TemplateService;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\View\View;
@@ -24,7 +22,6 @@ class SpaceController extends Controller
public function __construct(
protected RoomService $rooms,
protected SessionService $sessions,
protected TemplateService $templates,
protected InvitationService $invitations,
protected CalendarService $calendar,
protected SpaceService $spaces,
@@ -53,11 +50,6 @@ class SpaceController extends Controller
$organization = $this->organization($request);
$owner = $this->ownerRef($request);
$templates = Template::owned($owner)
->where('organization_id', $organization->id)
->orderBy('name')
->get();
$members = Member::owned($owner)
->where('organization_id', $organization->id)
->where('user_ref', '!=', $owner)
@@ -66,7 +58,6 @@ class SpaceController extends Controller
return view('meet.spaces.create', [
'organization' => $organization,
'templates' => $templates,
'members' => $members,
'timezones' => timezone_identifiers_list(),
'defaultSettings' => config('meet.default_settings'),
@@ -85,7 +76,6 @@ class SpaceController extends Controller
'duration_minutes' => ['nullable', 'integer', 'min:15', 'max:480'],
'timezone' => ['nullable', 'timezone'],
'passcode' => ['nullable', 'string', 'max:20'],
'template_id' => ['nullable', 'integer', 'exists:meet_templates,id'],
'invite_emails' => ['nullable', 'string'],
'speaker_refs' => ['nullable', 'array'],
'speaker_refs.*' => ['string', 'max:64'],
@@ -120,11 +110,6 @@ class SpaceController extends Controller
unset($data['speaker_refs'], $data['invite_only'], $data['mute_listeners']);
if (! empty($validated['template_id'])) {
$template = Template::findOrFail($validated['template_id']);
$data = $this->templates->applyToRoomData($template, $data);
}
$room = $this->rooms->create($request->user(), $organization, $data);
if ($emails = trim((string) ($validated['invite_emails'] ?? ''))) {
@@ -1,68 +0,0 @@
<?php
namespace App\Http\Controllers\Meet;
use App\Http\Controllers\Controller;
use App\Http\Controllers\Meet\Concerns\ScopesToAccount;
use App\Models\Template;
use App\Services\Meet\TemplateService;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\View\View;
class TemplateController extends Controller
{
use ScopesToAccount;
public function __construct(
protected TemplateService $templates,
) {}
public function index(Request $request): View
{
$this->authorizeAbility($request, 'meetings.manage');
$organization = $this->organization($request);
$templates = Template::owned($this->ownerRef($request))
->where('organization_id', $organization->id)
->orderBy('name')
->get();
return view('meet.templates.index', compact('templates', 'organization'));
}
public function create(Request $request): View
{
$this->authorizeAbility($request, 'meetings.manage');
return view('meet.templates.create', [
'defaultSettings' => config('meet.default_settings'),
]);
}
public function store(Request $request): RedirectResponse
{
$this->authorizeAbility($request, 'meetings.manage');
$organization = $this->organization($request);
$validated = $request->validate([
'name' => ['required', 'string', 'max:255'],
'description' => ['nullable', 'string'],
'duration_minutes' => ['nullable', 'integer', 'min:15', 'max:480'],
'is_default' => ['sometimes', 'boolean'],
'waiting_room' => ['sometimes', 'boolean'],
'auto_record' => ['sometimes', 'boolean'],
'live_captions' => ['sometimes', 'boolean'],
]);
$this->templates->create($request->user(), $organization, array_merge($validated, [
'settings' => [
'waiting_room' => $request->boolean('waiting_room', true),
'auto_record' => $request->boolean('auto_record'),
'live_captions' => $request->boolean('live_captions'),
],
]));
return redirect()->route('meet.templates.index')->with('success', 'Template saved.');
}
}
@@ -5,12 +5,10 @@ namespace App\Http\Controllers\Meet;
use App\Http\Controllers\Controller;
use App\Http\Controllers\Meet\Concerns\ScopesToAccount;
use App\Models\Room;
use App\Models\Template;
use App\Services\Meet\CalendarService;
use App\Services\Meet\InvitationService;
use App\Services\Meet\RoomService;
use App\Services\Meet\SessionService;
use App\Services\Meet\TemplateService;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\View\View;
@@ -22,7 +20,6 @@ class WebinarController extends Controller
public function __construct(
protected RoomService $rooms,
protected SessionService $sessions,
protected TemplateService $templates,
protected InvitationService $invitations,
protected CalendarService $calendar,
) {}
@@ -49,14 +46,8 @@ class WebinarController extends Controller
$this->authorizeAbility($request, 'meetings.create');
$organization = $this->organization($request);
$templates = Template::owned($this->ownerRef($request))
->where('organization_id', $organization->id)
->orderBy('name')
->get();
return view('meet.webinars.create', [
'organization' => $organization,
'templates' => $templates,
'timezones' => timezone_identifiers_list(),
'defaultSettings' => config('meet.default_settings'),
]);
@@ -74,7 +65,6 @@ class WebinarController extends Controller
'duration_minutes' => ['nullable', 'integer', 'min:15', 'max:480'],
'timezone' => ['nullable', 'timezone'],
'passcode' => ['nullable', 'string', 'max:20'],
'template_id' => ['nullable', 'integer', 'exists:meet_templates,id'],
'invite_emails' => ['nullable', 'string'],
'waiting_room' => ['sometimes', 'boolean'],
'join_before_host' => ['sometimes', 'boolean'],
@@ -105,11 +95,6 @@ class WebinarController extends Controller
'status' => 'scheduled',
]);
if (! empty($validated['template_id'])) {
$template = Template::findOrFail($validated['template_id']);
$data = $this->templates->applyToRoomData($template, $data);
}
$room = $this->rooms->create($request->user(), $organization, $data);
if ($emails = trim((string) ($validated['invite_emails'] ?? ''))) {
@@ -135,7 +120,9 @@ class WebinarController extends Controller
$room->load(['sessions.participants', 'invitations', 'sessions.recordings', 'sessions.aiSummaries', 'sessionFiles', 'webinarRegistrations']);
return view('meet.webinars.show', compact('room'));
$eventsEventUrl = \App\Support\EventsSourceLink::eventAdminUrl($room);
return view('meet.webinars.show', compact('room', 'eventsEventUrl'));
}
public function start(Request $request, Room $room): RedirectResponse
-5
View File
@@ -37,11 +37,6 @@ class Organization extends Model
return $this->hasMany(Member::class, 'organization_id');
}
public function templates(): HasMany
{
return $this->hasMany(Template::class, 'organization_id');
}
public function securitySetting(string $key, mixed $default = null): mixed
{
return data_get($this->security_policy, $key, data_get(config('meet.security_defaults'), $key, $default));
+1 -6
View File
@@ -19,7 +19,7 @@ class Room extends Model
'uuid', 'owner_ref', 'organization_id', 'branch_id', 'host_user_ref',
'title', 'description', 'type', 'status', 'slug', 'scheduled_at',
'duration_minutes', 'timezone', 'passcode', 'settings', 'source', 'calendar_event_id',
'template_id', 'recurring_series_id', 'recurrence_rule', 'recurrence_interval', 'recurrence_until',
'recurring_series_id', 'recurrence_rule', 'recurrence_interval', 'recurrence_until',
];
protected function casts(): array
@@ -144,11 +144,6 @@ class Room extends Model
return $this->type === 'town_hall';
}
public function template(): BelongsTo
{
return $this->belongsTo(Template::class, 'template_id');
}
public function isRecurring(): bool
{
return filled($this->recurrence_rule);
-50
View File
@@ -1,50 +0,0 @@
<?php
namespace App\Models;
use App\Models\Concerns\BelongsToOwner;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Support\Str;
class Template extends Model
{
use BelongsToOwner, SoftDeletes;
protected $table = 'meet_templates';
protected $fillable = [
'uuid', 'owner_ref', 'organization_id', 'name', 'description',
'duration_minutes', 'settings', 'is_default',
];
protected function casts(): array
{
return ['settings' => 'array', 'is_default' => 'boolean'];
}
protected static function booted(): void
{
static::creating(function (Template $template) {
if (empty($template->uuid)) {
$template->uuid = (string) Str::uuid();
}
});
}
public function getRouteKeyName(): string
{
return 'uuid';
}
public function organization(): BelongsTo
{
return $this->belongsTo(Organization::class, 'organization_id');
}
public function mergedSettings(): array
{
return array_merge(config('meet.default_settings'), $this->settings ?? []);
}
}
@@ -72,7 +72,6 @@ class RecurringMeetingService
'timezone' => $parent->timezone,
'passcode' => $parent->passcode,
'settings' => $parent->settings,
'template_id' => $parent->template_id,
'recurring_series_id' => $parent->recurring_series_id,
'recurrence_rule' => $parent->recurrence_rule,
'recurrence_interval' => $parent->recurrence_interval,
-42
View File
@@ -1,42 +0,0 @@
<?php
namespace App\Services\Meet;
use App\Models\Organization;
use App\Models\Template;
use App\Models\User;
use Illuminate\Support\Str;
class TemplateService
{
/**
* @param array<string, mixed> $data
*/
public function create(User $user, Organization $organization, array $data): Template
{
if ($data['is_default'] ?? false) {
Template::owned($user->ownerRef())
->where('organization_id', $organization->id)
->update(['is_default' => false]);
}
return Template::create([
'owner_ref' => $user->ownerRef(),
'organization_id' => $organization->id,
'name' => $data['name'],
'description' => $data['description'] ?? null,
'duration_minutes' => $data['duration_minutes'] ?? 60,
'settings' => array_merge(config('meet.default_settings'), $data['settings'] ?? []),
'is_default' => (bool) ($data['is_default'] ?? false),
]);
}
public function applyToRoomData(Template $template, array $data): array
{
return array_merge($data, [
'duration_minutes' => $data['duration_minutes'] ?? $template->duration_minutes,
'settings' => array_merge($template->mergedSettings(), $data['settings'] ?? []),
'template_id' => $template->id,
]);
}
}
+26
View File
@@ -0,0 +1,26 @@
<?php
namespace App\Support;
use App\Models\Room;
class EventsSourceLink
{
public static function eventAdminUrl(Room $room): ?string
{
$source = (array) ($room->source ?? []);
if (($source['app'] ?? '') !== 'events') {
return null;
}
$eventId = (int) ($source['event_id'] ?? 0);
if ($eventId <= 0) {
return null;
}
$base = rtrim((string) config('meet.events_app_url', 'https://events.ladill.com'), '/');
return $base.'/events/'.$eventId.'/attendees';
}
}