From 652f3034e4e1147e8925953368e8d7e6c79d78a6 Mon Sep 17 00:00:00 2001 From: Paul Pound Date: Fri, 6 Nov 2026 11:23:07 -0400 Subject: [PATCH] further checks for missing info when editing a room from the my reservation page --- reservation.inc | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/reservation.inc b/reservation.inc index 029612f..2df0452 100644 --- a/reservation.inc +++ b/reservation.inc @@ -96,11 +96,7 @@ function reserve_form_reserve_reservation_form_alter(array &$form, FormStateInte // fatal - show a message and only leave the form actions (e.g. Delete). if (!$entity) { reserve_set_modal_message($form, t('The item this reservation is for no longer exists.')); - foreach (\Drupal\Core\Render\Element::children($form) as $key) { - if (!in_array($key, ['actions', 'message', 'form_build_id', 'form_token', 'form_id'])) { - $form[$key]['#access'] = FALSE; - } - } + reserve_hide_reservation_form_fields($form); return; } $bundle = $entity->bundle(); @@ -241,6 +237,14 @@ function reserve_form_reserve_reservation_form_alter(array &$form, FormStateInte // limit valid lengths so we have no overlaps // this really only applies for EDIT now as we pick length in UI for CREATE $validlengths = reserve_valid_lengths($eid, $ebundle, $yyyymmdd, $t); + // NULL means the item is no longer reservable (e.g. unpublished, or its + // bundle no longer matches); only leave the form actions (e.g. Delete). + if ($validlengths === NULL) { + reserve_set_modal_message($form, t('The item this reservation is for is no longer available for booking.')); + reserve_hide_reservation_form_fields($form); + return; + } + $lengths = []; foreach ($validlengths as $length) { if ($length['is_valid']) { $lengths[] = $length['length']; @@ -290,6 +294,18 @@ function reserve_return_to_home_page($form, FormStateInterface $form_state) { $form_state->setRedirectUrl($url); } +/** + * Hides everything on the reservation form except the actions and messages. + */ +function reserve_hide_reservation_form_fields(array &$form) { + $keep = ['actions', 'message', 'status_messages', 'form_build_id', 'form_token', 'form_id']; + foreach (\Drupal\Core\Render\Element::children($form) as $key) { + if (!in_array($key, $keep)) { + $form[$key]['#access'] = FALSE; + } + } +} + function reserve_set_modal_message(&$form, $message) { $form['message'] = [ '#type' => 'markup',