Browse Source

changes for d11 compatibility

d11-dev
Paul Pound 2 weeks ago
parent
commit
95f9f3a684
  1. 9
      composer.json
  2. 11
      reservation.inc
  3. 2
      reserve.inc
  4. 2
      reserve.info.yml
  5. 6
      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", "name": "drupal/reserve",
"type": "drupal-module", "type": "drupal-module",
"description": "Reservation system.", "description": "Reservation system.",
"keywords": ["Drupal"], "keywords": [
"Drupal"
],
"license": "GPL-2.0+", "license": "GPL-2.0+",
"homepage": "https://www.drupal.org/project/reserve", "homepage": "https://www.drupal.org/project/reserve",
"minimum-stability": "dev", "minimum-stability": "dev",
@ -10,5 +12,8 @@
"issues": "https://www.drupal.org/project/issues/reserve", "issues": "https://www.drupal.org/project/issues/reserve",
"source": "http://cgit.drupalcode.org/reserve" "source": "http://cgit.drupalcode.org/reserve"
}, },
"require": { } "require": {
"drupal/core": "^10 || ^11",
"drupal/views_bulk_operations": "^4.2"
}
} }

11
reservation.inc

@ -39,11 +39,8 @@ function reserve_form_reserve_reservation_form_alter(array &$form, FormStateInte
$book_extended = TRUE; $book_extended = TRUE;
} }
//Allow perm 'add reservations extended' to add as many as needed. //Allow perm 'add reservations extended' to add as many as needed.
$roles_permissions = user_role_permissions($user_roles); if ($user->hasPermission('add reservations extended')) {
foreach ($roles_permissions as $role_key => $permissions) { $book_extended = TRUE;
if (in_array('add reservations extended', $permissions)) {
$book_extended = TRUE;
}
} }
//if (user_access('administer site configuration') && isset($_GET['edit']) && $_GET['edit'] == 'standard') { //if (user_access('administer site configuration') && isset($_GET['edit']) && $_GET['edit'] == 'standard') {
@ -100,9 +97,9 @@ function reserve_form_reserve_reservation_form_alter(array &$form, FormStateInte
// set default Group Name as name of current user // set default Group Name as name of current user
$form['name']['widget'][0]['value']['#required'] = TRUE; $form['name']['widget'][0]['value']['#required'] = TRUE;
$form['name']['widget'][0]['value']['#default_value'] = $form['name']['widget'][0]['value']['#default_value'] ? /*$form['name']['widget'][0]['value']['#default_value'] = $form['name']['widget'][0]['value']['#default_value'] ?
$form['name']['widget'][0]['value']['#default_value'] : $form['name']['widget'][0]['value']['#default_value'] :
\Drupal::currentUser()->getDisplayName(); \Drupal::currentUser()->getDisplayName();*/
// set values taken from URL // set values taken from URL
$form['reservation_date']['widget'][0]['value']['#default_value'] = DrupalDateTime::createFromTimestamp(strtotime($yyyymmdd)); $form['reservation_date']['widget'][0]['value']['#default_value'] = DrupalDateTime::createFromTimestamp(strtotime($yyyymmdd));

2
reserve.inc

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

2
reserve.info.yml

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

6
reserve.libraries.yml

@ -7,5 +7,9 @@ reserve:
js/reserve.js: {} js/reserve.js: {}
dependencies: dependencies:
- core/jquery - core/jquery
- core/once
- core/drupal
- core/drupalSettings - core/drupalSettings
- core/drupal.dialog.ajax - 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') $ids = \Drupal::service('entity_type.manager')
->getStorage('reserve_reservation')->getQuery() ->getStorage('reserve_reservation')->getQuery()
->condition('status', TRUE) ->condition('status', TRUE)
->condition('reservation_date', $yyyy_mmdd . '%', 'like') ->condition('reservation_date', $yyyy_mmdd . '%', 'LIKE')
->condition('reservation_ebundle', $ebundle) ->condition('reservation_ebundle', $ebundle)
//->sort('reservation_time', 'DESC') //->sort('reservation_time', 'DESC')
//->sort('reservations_display_order', 'ASC'); //->sort('reservations_display_order', 'ASC');
@ -668,7 +668,7 @@ class CalendarController extends ControllerBase {
$entity = ReserveReservation::create(); $entity = ReserveReservation::create();
$editForm = \Drupal::service('entity.form_builder')->getForm($entity, 'default'); $editForm = \Drupal::service('entity.form_builder')->getForm($entity, 'default');
$form = \Drupal::service('renderer')->renderPlain($editForm); $form = \Drupal::service('renderer')->renderInIsolation($editForm);
$response->setData($form); $response->setData($form);

1
src/ReserveCategoryListBuilder.php

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

1
src/ReserveReservationListBuilder.php

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

Loading…
Cancel
Save