Compare commits

..

1 Commits

Author SHA1 Message Date
Paul Pound 95f9f3a684 changes for d11 compatibility 2 weeks ago
  1. 9
      composer.json
  2. 5
      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,7 +2,9 @@
"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",
@ -10,5 +12,8 @@
"issues": "https://www.drupal.org/project/issues/reserve",
"source": "http://cgit.drupalcode.org/reserve"
},
"require": { }
"require": {
"drupal/core": "^10 || ^11",
"drupal/views_bulk_operations": "^4.2"
}
}

5
reservation.inc

@ -39,12 +39,9 @@ function reserve_form_reserve_reservation_form_alter(array &$form, FormStateInte
$book_extended = TRUE;
}
//Allow perm 'add reservations extended' to add as many as needed.
$roles_permissions = user_role_permissions($user_roles);
foreach ($roles_permissions as $role_key => $permissions) {
if (in_array('add reservations extended', $permissions)) {
if ($user->hasPermission('add reservations extended')) {
$book_extended = TRUE;
}
}
//if (user_access('administer site configuration') && isset($_GET['edit']) && $_GET['edit'] == 'standard') {
// return;

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: ^9.5 || ^10
core_version_requirement: ^10 || ^11
dependencies:
- drupal:views
- drupal:options

4
reserve.libraries.yml

@ -7,5 +7,9 @@ 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')->renderPlain($editForm);
$form = \Drupal::service('renderer')->renderInIsolation($editForm);
$response->setData($form);

1
src/ReserveCategoryListBuilder.php

@ -4,7 +4,6 @@ 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,7 +4,6 @@ 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