From 0ee9377ec759c0390dccf820026efdf8c5351f40 Mon Sep 17 00:00:00 2001
From: Brian Canini <canini.16@osu.edu>
Date: Tue, 25 Aug 2020 10:30:42 -0400
Subject: [PATCH] Updating drupal/views_bulk_operations (3.8.0 => 3.9.0)
---
composer.json | 2 +-
composer.lock | 18 +++++++++---------
vendor/composer/installed.json | 18 +++++++++---------
.../views_bulk_operations/composer.json | 3 ++-
.../views_bulk_operations/js/frontUi.js | 2 +-
.../actions_permissions.info.yml | 6 +++---
.../views_bulk_operations_example.info.yml | 6 +++---
.../ViewsBulkOperationsActionProcessor.php | 19 ++++++++++++-------
.../views_bulk_operations_test.info.yml | 6 +++---
.../views_bulk_operations.info.yml | 6 +++---
.../views_bulk_operations.install | 2 +-
11 files changed, 47 insertions(+), 41 deletions(-)
diff --git a/composer.json b/composer.json
index eabb4cc33b..343fb0df9d 100644
--- a/composer.json
+++ b/composer.json
@@ -178,7 +178,7 @@
"drupal/views_ajax_history": "1.5",
"drupal/views_autocomplete_filters": "1.3",
"drupal/views_bootstrap": "3.1",
- "drupal/views_bulk_operations": "3.8",
+ "drupal/views_bulk_operations": "3.9",
"drupal/views_fieldsets": "3.3",
"drupal/views_infinite_scroll": "1.7",
"drupal/views_slideshow": "4.4",
diff --git a/composer.lock b/composer.lock
index abfeef19f4..e5d2b9ef00 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "8bbf1b75a83436fa7654bf0208a40f2d",
+ "content-hash": "5bd1d20862216988e07684c327f3a84a",
"packages": [
{
"name": "alchemy/zippy",
@@ -8217,17 +8217,17 @@
},
{
"name": "drupal/views_bulk_operations",
- "version": "3.8.0",
+ "version": "3.9.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/views_bulk_operations.git",
- "reference": "8.x-3.8"
+ "reference": "8.x-3.9"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-8.x-3.8.zip",
- "reference": "8.x-3.8",
- "shasum": "0f8a736d14e034db42de685ebd6cc5f86583375b"
+ "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-8.x-3.9.zip",
+ "reference": "8.x-3.9",
+ "shasum": "d7f6e50c31d21ff32f21e8f4aaedb52f6dee2da8"
},
"require": {
"drupal/core": "^8.8 || ^9"
@@ -8241,8 +8241,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-3.8",
- "datestamp": "1591296880",
+ "version": "8.x-3.9",
+ "datestamp": "1597319021",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -8283,7 +8283,7 @@
"description": "Adds an ability to perform bulk operations on selected entities from view results. Provides an API to create such operations.",
"homepage": "https://www.drupal.org/project/views_bulk_operations",
"support": {
- "source": "https://git.drupalcode.org/project/views_bulk_operations",
+ "source": "https://git.drupalcode.org/project/views_bulk_operations/-/tree/8.x-3.x",
"issues": "https://www.drupal.org/project/issues/views_bulk_operations?version=8.x",
"docs": "https://www.drupal.org/docs/8/modules/views-bulk-operations-vbo"
}
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index cce0268e72..331188b672 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -8474,18 +8474,18 @@
},
{
"name": "drupal/views_bulk_operations",
- "version": "3.8.0",
- "version_normalized": "3.8.0.0",
+ "version": "3.9.0",
+ "version_normalized": "3.9.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/views_bulk_operations.git",
- "reference": "8.x-3.8"
+ "reference": "8.x-3.9"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-8.x-3.8.zip",
- "reference": "8.x-3.8",
- "shasum": "0f8a736d14e034db42de685ebd6cc5f86583375b"
+ "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-8.x-3.9.zip",
+ "reference": "8.x-3.9",
+ "shasum": "d7f6e50c31d21ff32f21e8f4aaedb52f6dee2da8"
},
"require": {
"drupal/core": "^8.8 || ^9"
@@ -8499,8 +8499,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-3.8",
- "datestamp": "1591296880",
+ "version": "8.x-3.9",
+ "datestamp": "1597319021",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
@@ -8542,7 +8542,7 @@
"description": "Adds an ability to perform bulk operations on selected entities from view results. Provides an API to create such operations.",
"homepage": "https://www.drupal.org/project/views_bulk_operations",
"support": {
- "source": "https://git.drupalcode.org/project/views_bulk_operations",
+ "source": "https://git.drupalcode.org/project/views_bulk_operations/-/tree/8.x-3.x",
"issues": "https://www.drupal.org/project/issues/views_bulk_operations?version=8.x",
"docs": "https://www.drupal.org/docs/8/modules/views-bulk-operations-vbo"
}
diff --git a/web/modules/views_bulk_operations/composer.json b/web/modules/views_bulk_operations/composer.json
index 9b8d29466d..0c90010448 100644
--- a/web/modules/views_bulk_operations/composer.json
+++ b/web/modules/views_bulk_operations/composer.json
@@ -11,7 +11,8 @@
],
"support": {
"issues": "https://www.drupal.org/project/issues/views_bulk_operations?version=8.x",
- "docs": "https://www.drupal.org/docs/8/modules/views-bulk-operations-vbo"
+ "docs": "https://www.drupal.org/docs/8/modules/views-bulk-operations-vbo",
+ "source": "https://git.drupalcode.org/project/views_bulk_operations/-/tree/8.x-3.x"
},
"license": "GPL-2.0-or-later",
"minimum-stability": "dev",
diff --git a/web/modules/views_bulk_operations/js/frontUi.js b/web/modules/views_bulk_operations/js/frontUi.js
index bf89987d4b..97bef56111 100644
--- a/web/modules/views_bulk_operations/js/frontUi.js
+++ b/web/modules/views_bulk_operations/js/frontUi.js
@@ -86,7 +86,7 @@
}
var $placeholder = this.$placeholder;
- var target_uri = '/' + drupalSettings.path.pathPrefix + 'views-bulk-operations/ajax/' + this.view_id + '/' + this.display_id;
+ var target_uri = drupalSettings.path.baseUrl + drupalSettings.path.pathPrefix + 'views-bulk-operations/ajax/' + this.view_id + '/' + this.display_id;
$.ajax(target_uri, {
method: 'POST',
data: {
diff --git a/web/modules/views_bulk_operations/modules/actions_permissions/actions_permissions.info.yml b/web/modules/views_bulk_operations/modules/actions_permissions/actions_permissions.info.yml
index af36f02146..cbe4230c85 100644
--- a/web/modules/views_bulk_operations/modules/actions_permissions/actions_permissions.info.yml
+++ b/web/modules/views_bulk_operations/modules/actions_permissions/actions_permissions.info.yml
@@ -6,7 +6,7 @@ core_version_requirement: ^8 || ^9
dependencies:
- drupal:views_bulk_operations
-# Information added by Drupal.org packaging script on 2020-06-04
-version: '8.x-3.8'
+# Information added by Drupal.org packaging script on 2020-08-13
+version: '8.x-3.9'
project: 'views_bulk_operations'
-datestamp: 1591296882
+datestamp: 1597319023
diff --git a/web/modules/views_bulk_operations/modules/views_bulk_operations_example/views_bulk_operations_example.info.yml b/web/modules/views_bulk_operations/modules/views_bulk_operations_example/views_bulk_operations_example.info.yml
index e8732eed77..f221f4c2ca 100644
--- a/web/modules/views_bulk_operations/modules/views_bulk_operations_example/views_bulk_operations_example.info.yml
+++ b/web/modules/views_bulk_operations/modules/views_bulk_operations_example/views_bulk_operations_example.info.yml
@@ -6,7 +6,7 @@ core_version_requirement: ^8 || ^9
dependencies:
- drupal:views_bulk_operations
-# Information added by Drupal.org packaging script on 2020-06-04
-version: '8.x-3.8'
+# Information added by Drupal.org packaging script on 2020-08-13
+version: '8.x-3.9'
project: 'views_bulk_operations'
-datestamp: 1591296882
+datestamp: 1597319023
diff --git a/web/modules/views_bulk_operations/src/Service/ViewsBulkOperationsActionProcessor.php b/web/modules/views_bulk_operations/src/Service/ViewsBulkOperationsActionProcessor.php
index 9ecc1f9eca..801f647e15 100644
--- a/web/modules/views_bulk_operations/src/Service/ViewsBulkOperationsActionProcessor.php
+++ b/web/modules/views_bulk_operations/src/Service/ViewsBulkOperationsActionProcessor.php
@@ -332,7 +332,12 @@ public function populateQueue(array $data, array &$context = []) {
}
if (isset($this->view->query->fields[$base_field])) {
- $base_field_alias = $this->view->query->fields[$base_field]['table'] . '.' . $this->view->query->fields[$base_field]['alias'];
+ if (!empty($this->view->query->fields[$base_field]['table'])) {
+ $base_field_alias = $this->view->query->fields[$base_field]['table'] . '.' . $this->view->query->fields[$base_field]['alias'];
+ }
+ else {
+ $base_field_alias = $this->view->query->fields[$base_field]['alias'];
+ }
}
else {
$base_field_alias = $base_field;
@@ -343,6 +348,10 @@ public function populateQueue(array $data, array &$context = []) {
// Rebuild the view query.
$this->view->query->build($this->view);
+ // We just destroyed any metadata that other modules may have added to the
+ // query. Give those modules the opportunity to alter the query again.
+ $this->view->query->alter($this->view);
+
// Execute the view.
$this->moduleHandler->invokeAll('views_pre_execute', [$this->view]);
$this->view->query->execute($this->view);
@@ -455,13 +464,9 @@ public function process() {
for ($i = 0; $i < $count; $i++) {
$output[] = $this->bulkFormData['action_label'];
}
+ return $output;
}
- else {
- foreach ($results as $result) {
- $output[] = $result;
- }
- }
- return $output;
+ return array_merge($output, $results);
}
/**
diff --git a/web/modules/views_bulk_operations/tests/views_bulk_operations_test/views_bulk_operations_test.info.yml b/web/modules/views_bulk_operations/tests/views_bulk_operations_test/views_bulk_operations_test.info.yml
index afb2114319..d38540259e 100644
--- a/web/modules/views_bulk_operations/tests/views_bulk_operations_test/views_bulk_operations_test.info.yml
+++ b/web/modules/views_bulk_operations/tests/views_bulk_operations_test/views_bulk_operations_test.info.yml
@@ -7,7 +7,7 @@ dependencies:
- drupal:views_bulk_operations
- drupal:node
-# Information added by Drupal.org packaging script on 2020-06-04
-version: '8.x-3.8'
+# Information added by Drupal.org packaging script on 2020-08-13
+version: '8.x-3.9'
project: 'views_bulk_operations'
-datestamp: 1591296882
+datestamp: 1597319023
diff --git a/web/modules/views_bulk_operations/views_bulk_operations.info.yml b/web/modules/views_bulk_operations/views_bulk_operations.info.yml
index e1dd4b9dd5..0c01345589 100644
--- a/web/modules/views_bulk_operations/views_bulk_operations.info.yml
+++ b/web/modules/views_bulk_operations/views_bulk_operations.info.yml
@@ -6,7 +6,7 @@ core_version_requirement: ^8.8 || ^9
dependencies:
- drupal:views
-# Information added by Drupal.org packaging script on 2020-06-04
-version: '8.x-3.8'
+# Information added by Drupal.org packaging script on 2020-08-13
+version: '8.x-3.9'
project: 'views_bulk_operations'
-datestamp: 1591296882
+datestamp: 1597319023
diff --git a/web/modules/views_bulk_operations/views_bulk_operations.install b/web/modules/views_bulk_operations/views_bulk_operations.install
index f044c57170..e55a00bdb6 100644
--- a/web/modules/views_bulk_operations/views_bulk_operations.install
+++ b/web/modules/views_bulk_operations/views_bulk_operations.install
@@ -34,7 +34,7 @@ function views_bulk_operations_update_8034(&$sandbox) {
if ($field['plugin_id'] === 'views_bulk_operations_bulk_form') {
$new_selected_actions = [];
foreach ($field['selected_actions'] as $plugin_id) {
- if (!$plugin_id) {
+ if (!is_string($plugin_id)) {
continue;
}
$action_config_array = ['action_id' => $plugin_id];
--
GitLab