|
|
|
|
@ -186,7 +186,7 @@ class CalendarController extends ControllerBase {
|
|
|
|
|
$ids = \Drupal::service('entity_type.manager') |
|
|
|
|
->getStorage('reserve_reservation')->getQuery() |
|
|
|
|
->condition('status', TRUE) |
|
|
|
|
->condition('reservation_date', $yyyy_mmdd . '%', 'LIKE') |
|
|
|
|
->condition('reservation_date', $yyyy_mmdd . '%', 'like') |
|
|
|
|
->condition('reservation_ebundle', $ebundle) |
|
|
|
|
//->sort('reservation_time', 'DESC') |
|
|
|
|
//->sort('reservations_display_order', 'ASC'); |
|
|
|
|
@ -668,7 +668,7 @@ class CalendarController extends ControllerBase {
|
|
|
|
|
|
|
|
|
|
$entity = ReserveReservation::create(); |
|
|
|
|
$editForm = \Drupal::service('entity.form_builder')->getForm($entity, 'default'); |
|
|
|
|
$form = \Drupal::service('renderer')->renderInIsolation($editForm); |
|
|
|
|
$form = \Drupal::service('renderer')->renderPlain($editForm); |
|
|
|
|
|
|
|
|
|
$response->setData($form); |
|
|
|
|
|
|
|
|
|
|