diff --git a/composer.json b/composer.json
index 5f9e0be08714fd9c0d4331481b215284c896c907..9dc015bac90da673d59650ca4242468e0cf67550 100644
--- a/composer.json
+++ b/composer.json
@@ -256,7 +256,6 @@
},
"patches": {
"drupal/core": {
- "2799049": "patches/role_based_email_access-2799049-d87.patch",
"2862291": "https://www.drupal.org/files/issues/2021-01-11/2862291-34.patch",
"2949017": "https://www.drupal.org/files/issues/2019-12-12/2949017-59.patch"
},
diff --git a/composer.lock b/composer.lock
index 4c73b782516d16c87c1639e2d11585e3fb62473f..b064f2fdff53037f7cb46219c5ce32e10e18bc07 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1936,17 +1936,17 @@
},
{
"name": "drupal/better_exposed_filters",
- "version": "5.0.0-beta2",
+ "version": "5.0.0-beta3",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/better_exposed_filters.git",
- "reference": "8.x-5.0-beta2"
+ "reference": "8.x-5.0-beta3"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/better_exposed_filters-8.x-5.0-beta2.zip",
- "reference": "8.x-5.0-beta2",
- "shasum": "3899191ee3fa383abe0162cc6701ddba86bae252"
+ "url": "https://ftp.drupal.org/files/projects/better_exposed_filters-8.x-5.0-beta3.zip",
+ "reference": "8.x-5.0-beta3",
+ "shasum": "23f00fe898cd9e4f2278ef790bc9f1d197312ac3"
},
"require": {
"drupal/core": "^8.8 || ^9",
@@ -1958,8 +1958,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-5.0-beta2",
- "datestamp": "1624554686",
+ "version": "8.x-5.0-beta3",
+ "datestamp": "1625665853",
"security-coverage": {
"status": "not-covered",
"message": "Beta releases are not covered by Drupal security advisories."
diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
index 4db56b03b3c991ccd5dcc0167672716ae36f0a96..93f98b6f6ce8e289184b480be2796b6f6ca65ac6 100644
--- a/vendor/composer/InstalledVersions.php
+++ b/vendor/composer/InstalledVersions.php
@@ -383,12 +383,12 @@ class InstalledVersions
),
'drupal/better_exposed_filters' =>
array (
- 'pretty_version' => '5.0.0-beta2',
- 'version' => '5.0.0.0-beta2',
+ 'pretty_version' => '5.0.0-beta3',
+ 'version' => '5.0.0.0-beta3',
'aliases' =>
array (
),
- 'reference' => '8.x-5.0-beta2',
+ 'reference' => '8.x-5.0-beta3',
),
'drupal/big_pipe' =>
array (
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 40d8f3d36c87d22963c8eac0ae3187c940651304..4385e614d8d5449e7abd14a11bbb7f4af02eaf7d 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1988,18 +1988,18 @@
},
{
"name": "drupal/better_exposed_filters",
- "version": "5.0.0-beta2",
- "version_normalized": "5.0.0.0-beta2",
+ "version": "5.0.0-beta3",
+ "version_normalized": "5.0.0.0-beta3",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/better_exposed_filters.git",
- "reference": "8.x-5.0-beta2"
+ "reference": "8.x-5.0-beta3"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/better_exposed_filters-8.x-5.0-beta2.zip",
- "reference": "8.x-5.0-beta2",
- "shasum": "3899191ee3fa383abe0162cc6701ddba86bae252"
+ "url": "https://ftp.drupal.org/files/projects/better_exposed_filters-8.x-5.0-beta3.zip",
+ "reference": "8.x-5.0-beta3",
+ "shasum": "23f00fe898cd9e4f2278ef790bc9f1d197312ac3"
},
"require": {
"drupal/core": "^8.8 || ^9",
@@ -2011,8 +2011,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-5.0-beta2",
- "datestamp": "1624554686",
+ "version": "8.x-5.0-beta3",
+ "datestamp": "1625665853",
"security-coverage": {
"status": "not-covered",
"message": "Beta releases are not covered by Drupal security advisories."
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index 062d57e643e1ae5363932223247d7d420aac4984..7586bb3e2257aa9061f18e4b417c533e2426c5a7 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -359,12 +359,12 @@
),
'drupal/better_exposed_filters' =>
array (
- 'pretty_version' => '5.0.0-beta2',
- 'version' => '5.0.0.0-beta2',
+ 'pretty_version' => '5.0.0-beta3',
+ 'version' => '5.0.0.0-beta3',
'aliases' =>
array (
),
- 'reference' => '8.x-5.0-beta2',
+ 'reference' => '8.x-5.0-beta3',
),
'drupal/big_pipe' =>
array (
diff --git a/web/modules/better_exposed_filters/better_exposed_filters.info.yml b/web/modules/better_exposed_filters/better_exposed_filters.info.yml
index d18294a3e861b0c76341abea4f735c92e10e8653..618d14e5c5d8af00ad260fd0954ef7d228cbb895 100644
--- a/web/modules/better_exposed_filters/better_exposed_filters.info.yml
+++ b/web/modules/better_exposed_filters/better_exposed_filters.info.yml
@@ -10,7 +10,7 @@ dependencies:
- jquery_ui_touch_punch:jquery_ui_touch_punch
- jquery_ui_datepicker:jquery_ui_datepicker
-# Information added by Drupal.org packaging script on 2021-06-24
-version: '8.x-5.0-beta2'
+# Information added by Drupal.org packaging script on 2021-07-07
+version: '8.x-5.0-beta3'
project: 'better_exposed_filters'
-datestamp: 1624554649
+datestamp: 1625665749
diff --git a/web/modules/better_exposed_filters/better_exposed_filters.install b/web/modules/better_exposed_filters/better_exposed_filters.install
index 4dede0b9c2915189e98b007f1e4ebffcc88c7f4e..e6606d3343505d39515d6e3881d3f354cf134d04 100644
--- a/web/modules/better_exposed_filters/better_exposed_filters.install
+++ b/web/modules/better_exposed_filters/better_exposed_filters.install
@@ -152,17 +152,19 @@ function better_exposed_filters_update_8002() {
// Go through each display on each view.
$displays = $config->get('display');
+ $needs_update = FALSE;
foreach ($displays as $display_name => $display) {
if (!empty($display['display_options']['exposed_form'])) {
$exposed_form = $display['display_options']['exposed_form'];
// Find BEF exposed forms.
if (isset($exposed_form['type']) && $exposed_form['type'] === 'bef') {
- $bef_settings = [];
+ $bef_settings = $exposed_form['options']['bef'];
foreach ($exposed_form['options']['bef'] as $type => $option) {
if ($type === 'filter') {
$field_name = $type;
// Sliders.
- if ($option['bef_format'] === 'bef_slider') {
+ if (($option['bef_format'] ?? '') === 'bef_slider') {
+ $needs_update = TRUE;
// Update plugin name to 'bef_sliders'.
$bef_settings['filter'][$field_name] = [
'plugin_id' => 'bef_sliders',
@@ -192,11 +194,14 @@ function better_exposed_filters_update_8002() {
}
// Update BEF settings.
- $config->set("display.$display_name.display_options.exposed_form.options.bef", $bef_settings);
+ if ($needs_update) {
+ $config->set("display.$display_name.display_options.exposed_form.options.bef", $bef_settings);
+ }
}
}
}
-
- $config->save(TRUE);
+ if ($needs_update) {
+ $config->save(TRUE);
+ }
}
}
diff --git a/web/modules/better_exposed_filters/src/Plugin/better_exposed_filters/filter/Sliders.php b/web/modules/better_exposed_filters/src/Plugin/better_exposed_filters/filter/Sliders.php
index a6935c3aef920700d1c201bbcf87b0359129334a..19267b5697bd8f96b13b400962f5da03c8718362 100644
--- a/web/modules/better_exposed_filters/src/Plugin/better_exposed_filters/filter/Sliders.php
+++ b/web/modules/better_exposed_filters/src/Plugin/better_exposed_filters/filter/Sliders.php
@@ -68,19 +68,14 @@ public function buildConfigurationForm(array $form, FormStateInterface $form_sta
$form = parent::buildConfigurationForm($form, $form_state);
- $form['wrapper'] = [
- '#type' => 'container',
- '#attributes' => ['class' => ['']],
- ];
-
- $form['wrapper']['min'] = [
+ $form['min'] = [
'#type' => 'number',
'#title' => $this->t('Range minimum'),
'#default_value' => $this->configuration['min'],
'#description' => $this->t('The minimum allowed value for the jQuery range slider. It can be positive, negative, or zero and have up to 11 decimal places.'),
];
- $form['wrapper']['max'] = [
+ $form['max'] = [
'#type' => 'number',
'#title' => $this->t('Range maximum'),
'#default_value' => $this->configuration['max'],
@@ -144,7 +139,7 @@ public function validateConfigurationForm(array &$form, FormStateInterface $form
// Max must be > min.
$min = $form_state->getValue('min');
$max = $form_state->getValue('max');
- if ($max <= $min) {
+ if (!empty($min) && $max <= $min) {
$form_state->setError($form['max'], $this->t('The slider max value must be greater than the slider min value.'));
}
diff --git a/web/modules/better_exposed_filters/tests/modules/bef_test/bef_test.info.yml b/web/modules/better_exposed_filters/tests/modules/bef_test/bef_test.info.yml
index deeea184761c62628dea954afbf11c2491199838..6cd859141c648cb3b0b87e794d48e0d03d144343 100644
--- a/web/modules/better_exposed_filters/tests/modules/bef_test/bef_test.info.yml
+++ b/web/modules/better_exposed_filters/tests/modules/bef_test/bef_test.info.yml
@@ -10,7 +10,7 @@ dependencies:
- drupal:options
- drupal:user
-# Information added by Drupal.org packaging script on 2021-06-24
-version: '8.x-5.0-beta2'
+# Information added by Drupal.org packaging script on 2021-07-07
+version: '8.x-5.0-beta3'
project: 'better_exposed_filters'
-datestamp: 1624554649
+datestamp: 1625665749