diff --git a/composer.json b/composer.json index 2a8e53f..256fa7f 100644 --- a/composer.json +++ b/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" + } } diff --git a/reservation.inc b/reservation.inc index 2257305..8e1cac1 100644 --- a/reservation.inc +++ b/reservation.inc @@ -39,11 +39,8 @@ 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)) { - $book_extended = TRUE; - } + if ($user->hasPermission('add reservations extended')) { + $book_extended = TRUE; } //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 $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'] : - \Drupal::currentUser()->getDisplayName(); + \Drupal::currentUser()->getDisplayName();*/ // set values taken from URL $form['reservation_date']['widget'][0]['value']['#default_value'] = DrupalDateTime::createFromTimestamp(strtotime($yyyymmdd)); diff --git a/reserve.inc b/reserve.inc index 9fe062c..2799417 100644 --- a/reserve.inc +++ b/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); } diff --git a/reserve.info.yml b/reserve.info.yml index 87d3ad7..5d23d68 100644 --- a/reserve.info.yml +++ b/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 diff --git a/reserve.libraries.yml b/reserve.libraries.yml index 9f27dec..b7c3ad4 100644 --- a/reserve.libraries.yml +++ b/reserve.libraries.yml @@ -7,5 +7,9 @@ reserve: js/reserve.js: {} dependencies: - core/jquery + - core/once + - core/drupal - core/drupalSettings - - core/drupal.dialog.ajax \ No newline at end of file + - core/drupal.ajax + - core/drupal.dialog + - core/drupal.dialog.ajax diff --git a/src/Controller/CalendarController.php b/src/Controller/CalendarController.php index 56aeac3..28eba7c 100644 --- a/src/Controller/CalendarController.php +++ b/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); diff --git a/src/ReserveCategoryListBuilder.php b/src/ReserveCategoryListBuilder.php index 7e5d8bf..674b99a 100644 --- a/src/ReserveCategoryListBuilder.php +++ b/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; diff --git a/src/ReserveReservationListBuilder.php b/src/ReserveReservationListBuilder.php index 68a91d7..b7d2508 100644 --- a/src/ReserveReservationListBuilder.php +++ b/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;