From 7a1b935dd8e5165ce38b390888c66237e0bf40ff Mon Sep 17 00:00:00 2001
From: Brian Canini <canini.16@osu.edu>
Date: Mon, 29 Jun 2020 14:18:46 -0400
Subject: [PATCH] Updating drupal/block_region_permissions (1.2.0 => 1.3.0)
Installing drupal/block_permissions (1.1.0) Removing block_permissions patch
---
composer.json | 7 +--
composer.lock | 58 +++++++++---------
vendor/composer/installed.json | 60 +++++++++----------
.../block_permissions.info.yml | 10 ++--
web/modules/block_permissions/composer.json | 11 ++++
.../src/BlockPermissionsPermissions.php | 4 +-
.../block_region_permissions.info.yml | 10 ++--
7 files changed, 80 insertions(+), 80 deletions(-)
create mode 100644 web/modules/block_permissions/composer.json
diff --git a/composer.json b/composer.json
index aabb08e27f..c6fdd88d5e 100644
--- a/composer.json
+++ b/composer.json
@@ -95,8 +95,8 @@
"drupal/better_exposed_filters": "3.0-alpha6",
"drupal/bigmenu": "1.0.0-alpha1",
"drupal/block_field": "1.0.0-rc1",
- "drupal/block_permissions": "1.0",
- "drupal/block_region_permissions": "1.2",
+ "drupal/block_permissions": "1.1",
+ "drupal/block_region_permissions": "1.3",
"drupal/bootstrap": "3.16",
"drupal/ckeditor_indentblock": "1.0.0-beta2",
"drupal/config_direct_save": "1.0",
@@ -279,9 +279,6 @@
"drupal/better_exposed_filters": {
"2961022": "https://www.drupal.org/files/issues/2018-09-27/better_exposed_filters-autosubmit-fix-2961022-4.patch"
},
- "drupal/block_permissions": {
- "2962965": "https://www.drupal.org/files/issues/2018-09-01/block-permissions-2962965-4.patch"
- },
"drupal/entity_clone": {
"3060223": "https://www.drupal.org/files/issues/2019-10-17/%20entity_clone-corrupted-paragraph-cloning-3060223-5.patch"
},
diff --git a/composer.lock b/composer.lock
index cd907bc32a..d5ba1a7757 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": "7d3787aaafd1ba3db8d0785fee363f8b",
+ "content-hash": "742027a26affa40ace39ccc76502c11f",
"packages": [
{
"name": "alchemy/zippy",
@@ -2516,43 +2516,41 @@
},
{
"name": "drupal/block_permissions",
- "version": "1.0.0",
+ "version": "1.1.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/block_permissions.git",
- "reference": "8.x-1.0"
+ "reference": "8.x-1.1"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/block_permissions-8.x-1.0.zip",
- "reference": "8.x-1.0",
- "shasum": "3f1cb219379fc88a80445d494f66dd4fb2a5befa"
+ "url": "https://ftp.drupal.org/files/projects/block_permissions-8.x-1.1.zip",
+ "reference": "8.x-1.1",
+ "shasum": "734c00f78dfb674294b2d35bc87fcaed7ecf2042"
},
"require": {
- "drupal/core": "~8.0"
+ "drupal/core": "^8 || ^9"
},
"type": "drupal-module",
"extra": {
- "branch-alias": {
- "dev-1.x": "1.x-dev"
- },
"drupal": {
- "version": "8.x-1.0",
- "datestamp": "1478790983",
+ "version": "8.x-1.1",
+ "datestamp": "1592480089",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
}
- },
- "patches_applied": {
- "2962965": "https://www.drupal.org/files/issues/2018-09-01/block-permissions-2962965-4.patch"
}
},
"notification-url": "https://packages.drupal.org/8/downloads",
"license": [
- "GPL-2.0-or-later"
+ "GPL-2.0+"
],
"authors": [
+ {
+ "name": "Steven Buteneers",
+ "homepage": "https://www.drupal.org/user/3301055"
+ },
{
"name": "jefuri",
"homepage": "https://www.drupal.org/user/2733365"
@@ -2565,37 +2563,35 @@
"description": "Adds specific permissions for administering blocks.",
"homepage": "https://www.drupal.org/project/block_permissions",
"support": {
- "source": "http://cgit.drupalcode.org/block_permissions"
+ "source": "http://cgit.drupalcode.org/block_permissions",
+ "issues": "https://www.drupal.org/project/issues/block_permissions?version=8.x"
}
},
{
"name": "drupal/block_region_permissions",
- "version": "1.2.0",
+ "version": "1.3.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/block_region_permissions.git",
- "reference": "8.x-1.2"
+ "reference": "8.x-1.3"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/block_region_permissions-8.x-1.2.zip",
- "reference": "8.x-1.2",
- "shasum": "9776b2be5af7b9ebe7777f17487ef31e48f76c78"
+ "url": "https://ftp.drupal.org/files/projects/block_region_permissions-8.x-1.3.zip",
+ "reference": "8.x-1.3",
+ "shasum": "ae52eaf8e4186aa68f8cc151770030addc4b8742"
},
"require": {
- "drupal/core": "~8.0"
+ "drupal/core": "^8 || ^9"
},
"type": "drupal-module",
"extra": {
- "branch-alias": {
- "dev-1.x": "1.x-dev"
- },
"drupal": {
- "version": "8.x-1.2",
- "datestamp": "1507771445",
+ "version": "8.x-1.3",
+ "datestamp": "1592351316",
"security-coverage": {
- "status": "not-covered",
- "message": "Project has not opted into security advisory coverage!"
+ "status": "covered",
+ "message": "Covered by Drupal's security advisory policy"
}
}
},
@@ -2612,7 +2608,7 @@
"description": "Adds specific permissions for administering blocks for each theme's regions.",
"homepage": "https://www.drupal.org/project/block_region_permissions",
"support": {
- "source": "http://cgit.drupalcode.org/block_region_permissions"
+ "source": "https://git.drupalcode.org/project/block_region_permissions"
}
},
{
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 9d55d91d2d..76210f487a 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -2595,45 +2595,43 @@
},
{
"name": "drupal/block_permissions",
- "version": "1.0.0",
- "version_normalized": "1.0.0.0",
+ "version": "1.1.0",
+ "version_normalized": "1.1.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/block_permissions.git",
- "reference": "8.x-1.0"
+ "reference": "8.x-1.1"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/block_permissions-8.x-1.0.zip",
- "reference": "8.x-1.0",
- "shasum": "3f1cb219379fc88a80445d494f66dd4fb2a5befa"
+ "url": "https://ftp.drupal.org/files/projects/block_permissions-8.x-1.1.zip",
+ "reference": "8.x-1.1",
+ "shasum": "734c00f78dfb674294b2d35bc87fcaed7ecf2042"
},
"require": {
- "drupal/core": "~8.0"
+ "drupal/core": "^8 || ^9"
},
"type": "drupal-module",
"extra": {
- "branch-alias": {
- "dev-1.x": "1.x-dev"
- },
"drupal": {
- "version": "8.x-1.0",
- "datestamp": "1478790983",
+ "version": "8.x-1.1",
+ "datestamp": "1592480089",
"security-coverage": {
"status": "covered",
"message": "Covered by Drupal's security advisory policy"
}
- },
- "patches_applied": {
- "2962965": "https://www.drupal.org/files/issues/2018-09-01/block-permissions-2962965-4.patch"
}
},
"installation-source": "dist",
"notification-url": "https://packages.drupal.org/8/downloads",
"license": [
- "GPL-2.0-or-later"
+ "GPL-2.0+"
],
"authors": [
+ {
+ "name": "Steven Buteneers",
+ "homepage": "https://www.drupal.org/user/3301055"
+ },
{
"name": "jefuri",
"homepage": "https://www.drupal.org/user/2733365"
@@ -2646,38 +2644,36 @@
"description": "Adds specific permissions for administering blocks.",
"homepage": "https://www.drupal.org/project/block_permissions",
"support": {
- "source": "http://cgit.drupalcode.org/block_permissions"
+ "source": "http://cgit.drupalcode.org/block_permissions",
+ "issues": "https://www.drupal.org/project/issues/block_permissions?version=8.x"
}
},
{
"name": "drupal/block_region_permissions",
- "version": "1.2.0",
- "version_normalized": "1.2.0.0",
+ "version": "1.3.0",
+ "version_normalized": "1.3.0.0",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/block_region_permissions.git",
- "reference": "8.x-1.2"
+ "reference": "8.x-1.3"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/block_region_permissions-8.x-1.2.zip",
- "reference": "8.x-1.2",
- "shasum": "9776b2be5af7b9ebe7777f17487ef31e48f76c78"
+ "url": "https://ftp.drupal.org/files/projects/block_region_permissions-8.x-1.3.zip",
+ "reference": "8.x-1.3",
+ "shasum": "ae52eaf8e4186aa68f8cc151770030addc4b8742"
},
"require": {
- "drupal/core": "~8.0"
+ "drupal/core": "^8 || ^9"
},
"type": "drupal-module",
"extra": {
- "branch-alias": {
- "dev-1.x": "1.x-dev"
- },
"drupal": {
- "version": "8.x-1.2",
- "datestamp": "1507771445",
+ "version": "8.x-1.3",
+ "datestamp": "1592351316",
"security-coverage": {
- "status": "not-covered",
- "message": "Project has not opted into security advisory coverage!"
+ "status": "covered",
+ "message": "Covered by Drupal's security advisory policy"
}
}
},
@@ -2695,7 +2691,7 @@
"description": "Adds specific permissions for administering blocks for each theme's regions.",
"homepage": "https://www.drupal.org/project/block_region_permissions",
"support": {
- "source": "http://cgit.drupalcode.org/block_region_permissions"
+ "source": "https://git.drupalcode.org/project/block_region_permissions"
}
},
{
diff --git a/web/modules/block_permissions/block_permissions.info.yml b/web/modules/block_permissions/block_permissions.info.yml
index a713c7e4c4..30fd7150de 100644
--- a/web/modules/block_permissions/block_permissions.info.yml
+++ b/web/modules/block_permissions/block_permissions.info.yml
@@ -2,10 +2,10 @@ name: 'Block permissions'
type: module
description: 'Adds specific permissions for administering blocks.'
package: Block
-# core: '8.x'
-
-# Information added by Drupal.org packaging script on 2016-11-10
-version: '8.x-1.0'
core: '8.x'
+core_version_requirement: ^8 || ^9
+
+# Information added by Drupal.org packaging script on 2020-06-18
+version: '8.x-1.1'
project: 'block_permissions'
-datestamp: 1478790984
+datestamp: 1592480090
diff --git a/web/modules/block_permissions/composer.json b/web/modules/block_permissions/composer.json
new file mode 100644
index 0000000000..033fa6952b
--- /dev/null
+++ b/web/modules/block_permissions/composer.json
@@ -0,0 +1,11 @@
+{
+ "name": "drupal/block_permissions",
+ "type": "drupal-module",
+ "description": "Adds specific permissions for administering blocks.",
+ "homepage": "https://www.drupal.org/project/block_permissions",
+ "support": {
+ "issues": "https://www.drupal.org/project/issues/block_permissions?version=8.x",
+ "source": "http://cgit.drupalcode.org/block_permissions"
+ },
+ "license": "GPL-2.0+"
+}
diff --git a/web/modules/block_permissions/src/BlockPermissionsPermissions.php b/web/modules/block_permissions/src/BlockPermissionsPermissions.php
index 00a3534877..9a158982db 100644
--- a/web/modules/block_permissions/src/BlockPermissionsPermissions.php
+++ b/web/modules/block_permissions/src/BlockPermissionsPermissions.php
@@ -63,10 +63,10 @@ public function permissions() {
// administration per theme.
$themes = $this->themeHandler->listInfo();
foreach ($themes as $key => $theme) {
- if (isset($theme->info['hidden']) && $theme->status == 1 && $theme->info['hidden'] != 1) {
+ if ($theme->status == 1 && (!isset($theme->info['hidden']) || $theme->info['hidden'] != 1)) {
$permissions['administer block settings for theme ' . $key] = [
'title' => $this->t('Administer block settings for the theme @label', ['@label' => ucfirst($theme->getName())]),
- 'description' => $this->t('This permission s the administer blocks permission.'),
+ 'description' => $this->t('This permission refines the administer blocks permission.'),
];
}
}
diff --git a/web/modules/block_region_permissions/block_region_permissions.info.yml b/web/modules/block_region_permissions/block_region_permissions.info.yml
index 65fe8c5eb6..53eccc024a 100644
--- a/web/modules/block_region_permissions/block_region_permissions.info.yml
+++ b/web/modules/block_region_permissions/block_region_permissions.info.yml
@@ -2,10 +2,10 @@ name: Block Region Permissions
description: "Adds specific permissions for administering blocks for each theme's regions."
package: Block
type: module
-# core: 8.x
+core: 8.x
+core_version_requirement: ^8 || ^9
-# Information added by Drupal.org packaging script on 2017-10-12
-version: '8.x-1.2'
-core: '8.x'
+# Information added by Drupal.org packaging script on 2020-06-16
+version: '8.x-1.3'
project: 'block_region_permissions'
-datestamp: 1507771447
+datestamp: 1592351318
--
GitLab