Refine control room upload settings UI defaults
This commit is contained in:
@@ -2923,7 +2923,7 @@ class EventPublicController extends BaseController
|
||||
$autoApproveUploads = $uploadVisibility === 'immediate';
|
||||
$controlRoom = Arr::get($eventModel->settings ?? [], 'control_room', []);
|
||||
$controlRoom = is_array($controlRoom) ? $controlRoom : [];
|
||||
$autoAddApprovedToLiveSetting = (bool) Arr::get($controlRoom, 'auto_add_approved_to_live', false);
|
||||
$autoAddApprovedToLiveSetting = (bool) Arr::get($controlRoom, 'auto_add_approved_to_live', true);
|
||||
$trustedUploaders = Arr::get($controlRoom, 'trusted_uploaders', []);
|
||||
$forceReviewUploaders = Arr::get($controlRoom, 'force_review_uploaders', []);
|
||||
$autoAddApprovedToLiveDefault = $autoAddApprovedToLiveSetting || $autoApproveUploads;
|
||||
|
||||
@@ -133,7 +133,7 @@ class PhotoController extends Controller
|
||||
$photo->status = $validated['visible'] ? 'approved' : 'hidden';
|
||||
$photo->save();
|
||||
|
||||
$autoRemoveLiveOnHide = (bool) Arr::get($event->settings ?? [], 'control_room.auto_remove_live_on_hide', false);
|
||||
$autoRemoveLiveOnHide = (bool) Arr::get($event->settings ?? [], 'control_room.auto_remove_live_on_hide', true);
|
||||
if ($autoRemoveLiveOnHide && ! $validated['visible']) {
|
||||
$photo->rejectForLiveShow($request->user(), 'hidden');
|
||||
}
|
||||
@@ -537,7 +537,7 @@ class PhotoController extends Controller
|
||||
|
||||
$photo->update($validated);
|
||||
|
||||
$autoRemoveLiveOnHide = (bool) Arr::get($event->settings ?? [], 'control_room.auto_remove_live_on_hide', false);
|
||||
$autoRemoveLiveOnHide = (bool) Arr::get($event->settings ?? [], 'control_room.auto_remove_live_on_hide', true);
|
||||
if ($autoRemoveLiveOnHide && ($validated['status'] ?? null) === 'rejected') {
|
||||
$photo->rejectForLiveShow($request->user());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user