Compare commits

..

No commits in common. 'd11-dev' and 'd10-dev' have entirely different histories.

  1. 9
      composer.json
  2. 37
      reservation.inc
  3. 2
      reserve.inc
  4. 2
      reserve.info.yml
  5. 4
      reserve.libraries.yml
  6. 4
      src/Controller/CalendarController.php
  7. 1
      src/ReserveCategoryListBuilder.php
  8. 1
      src/ReserveReservationListBuilder.php

9
composer.json

@ -2,9 +2,7 @@
"name": "drupal/reserve",
"type": "drupal-module",
"description": "Reservation system.",
"keywords": [
"Drupal"
],
"keywords": ["Drupal"],
"license": "GPL-2.0+",
"homepage": "https://www.drupal.org/project/reserve",
"minimum-stability": "dev",
@ -12,8 +10,5 @@
"issues": "https://www.drupal.org/project/issues/reserve",
"source": "http://cgit.drupalcode.org/reserve"
},
"require": {
"drupal/core": "^10 || ^11",
"drupal/views_bulk_operations": "^4.2"
}
"require": { }
}

37
reservation.inc

@ -39,9 +39,12 @@ function reserve_form_reserve_reservation_form_alter(array &$form, FormStateInte
$book_extended = TRUE;
}
//Allow perm 'add reservations extended' to add as many as needed.
if ($user->hasPermission('add reservations extended')) {
$roles_permissions = user_role_permissions($user_roles);
foreach ($roles_permissions as $role_key => $permissions) {
if (in_array('add reservations extended', $permissions)) {
$book_extended = TRUE;
}
}
//if (user_access('administer site configuration') && isset($_GET['edit']) && $_GET['edit'] == 'standard') {
// return;
@ -88,17 +91,7 @@ function reserve_form_reserve_reservation_form_alter(array &$form, FormStateInte
reserve_set_modal_message($form, $max_reservations_exceeded_message);
}
}
$entity_type_manager = \Drupal::entityTypeManager();
$entity = ($entity_type && $eid && $entity_type_manager->hasDefinition($entity_type))
? $entity_type_manager->getStorage($entity_type)->load($eid)
: NULL;
// The reservable item may have been deleted (or the URL is invalid); don't
// 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.'));
reserve_hide_reservation_form_fields($form);
return;
}
$entity = \Drupal::entityTypeManager()->getStorage($entity_type)->load($eid);
$bundle = $entity->bundle();
$date = date('l, M d, Y', strtotime($d));
$time = reserve_display_time($t);
@ -237,14 +230,6 @@ 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'];
@ -294,18 +279,6 @@ 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',

2
reserve.inc

@ -935,7 +935,7 @@ function reserve_daily_max_exceeded($yyyy_mmdd) {
->getStorage('reserve_reservation')->getQuery()
->accessCheck(FALSE)
->condition('user_id', $user->id())
->condition('reservation_date', $yyyy_mmdd . '%', 'LIKE')
->condition('reservation_date', $yyyy_mmdd . '%', 'like')
->execute();
$record_count = count($ids);
}

2
reserve.info.yml

@ -2,7 +2,7 @@ name: Reserve
type: module
description: Reservation system.
package: Reserve
core_version_requirement: ^10 || ^11
core_version_requirement: ^9.5 || ^10
dependencies:
- drupal:views
- drupal:options

4
reserve.libraries.yml

@ -7,9 +7,5 @@ reserve:
js/reserve.js: {}
dependencies:
- core/jquery
- core/once
- core/drupal
- core/drupalSettings
- core/drupal.ajax
- core/drupal.dialog
- core/drupal.dialog.ajax

4
src/Controller/CalendarController.php

@ -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);

1
src/ReserveCategoryListBuilder.php

@ -4,6 +4,7 @@ namespace Drupal\reserve;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityListBuilder;
use Drupal\Core\Routing\LinkGeneratorTrait;
use Drupal\Core\Url;
use Drupal\Core\Link;

1
src/ReserveReservationListBuilder.php

@ -4,6 +4,7 @@ namespace Drupal\reserve;
use Drupal\Core\Entity\EntityInterface;
use Drupal\Core\Entity\EntityListBuilder;
use Drupal\Core\Routing\LinkGeneratorTrait;
use Drupal\Core\Url;
use Drupal\Core\Link;

Loading…
Cancel
Save