Browse Source

further checks for missing info when editing a room from the my reservation page

d11-dev
Paul Pound 2 weeks ago
parent
commit
652f3034e4
  1. 26
      reservation.inc

26
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). // fatal - show a message and only leave the form actions (e.g. Delete).
if (!$entity) { if (!$entity) {
reserve_set_modal_message($form, t('The item this reservation is for no longer exists.')); reserve_set_modal_message($form, t('The item this reservation is for no longer exists.'));
foreach (\Drupal\Core\Render\Element::children($form) as $key) { reserve_hide_reservation_form_fields($form);
if (!in_array($key, ['actions', 'message', 'form_build_id', 'form_token', 'form_id'])) {
$form[$key]['#access'] = FALSE;
}
}
return; return;
} }
$bundle = $entity->bundle(); $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 // limit valid lengths so we have no overlaps
// this really only applies for EDIT now as we pick length in UI for CREATE // this really only applies for EDIT now as we pick length in UI for CREATE
$validlengths = reserve_valid_lengths($eid, $ebundle, $yyyymmdd, $t); $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) { foreach ($validlengths as $length) {
if ($length['is_valid']) { if ($length['is_valid']) {
$lengths[] = $length['length']; $lengths[] = $length['length'];
@ -290,6 +294,18 @@ function reserve_return_to_home_page($form, FormStateInterface $form_state) {
$form_state->setRedirectUrl($url); $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) { function reserve_set_modal_message(&$form, $message) {
$form['message'] = [ $form['message'] = [
'#type' => 'markup', '#type' => 'markup',

Loading…
Cancel
Save