From e57fea0018b009eb893477a9de2f81a93ce1955b Mon Sep 17 00:00:00 2001
From: Rajab Natshah <rajabn@gmail.com>
Date: Mon, 14 Aug 2017 18:41:07 +0300
Subject: [PATCH] Issue #2902082: Added [Custom Permissions] module 8.x-1.0 and
the patch to fix a conflict with config_translate
---
composer.json | 5 +++++
drupal-org.make | 5 +++++
.../varbase_admin/varbase_admin.info.yml | 1 +
.../varbase_features/varbase_admin/varbase_admin.install | 9 +++++++++
4 files changed, 20 insertions(+)
diff --git a/composer.json b/composer.json
index 463f68f4..21bca5a1 100644
--- a/composer.json
+++ b/composer.json
@@ -71,6 +71,7 @@
"drupal/ultimate_cron": "2.0-alpha1",
"drupal/persistent_login": "1.0-alpha3",
"drupal/userprotect": "1.0",
+ "drupal/config_perms": "1.0",
"drupal/roleassign": "1.0-alpha2",
"drupal/admin_toolbar": "1.19",
"drupal/adminimal_admin_toolbar": "1.5",
@@ -283,6 +284,10 @@
"drupal/ckeditor_media_embed": {
"Issue #2900313: Add ability to embed tweets and other rich content in WYSIWYG":
"https://www.drupal.org/files/issues/embed_rich_content_in_WYSIWYG-2900313-2.patch"
+ },
+ "drupal/config_perms": {
+ "Issue #2877329 by josebc: When [content_translation] module is enabled, And enabled [Custom Permissions], Then we will get Route custom_perms_select_list_form does not exist":
+ "https://www.drupal.org/files/issues/config_perms-added_missing_edit_route-2877329-8.patch"
}
}
}
diff --git a/drupal-org.make b/drupal-org.make
index 0d624fda..150c7378 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -153,6 +153,11 @@ projects[persistent_login][version] = 1.0-alpha3
projects[userprotect][type] = module
projects[userprotect][version] = 1.0
+projects[config_perms][type] = module
+projects[config_perms][version] = 1.0
+;; Issue #2877329 by josebc: When [content_translation] module is enabled, And enabled [Custom Permissions], Then we will get Route custom_perms_select_list_form does not exist
+projects[config_perms][patch][] = https://www.drupal.org/files/issues/config_perms-added_missing_edit_route-2877329-8.patch
+
projects[roleassign][type] = module
projects[roleassign][version] = 1.0-alpha2
diff --git a/modules/varbase_features/varbase_admin/varbase_admin.info.yml b/modules/varbase_features/varbase_admin/varbase_admin.info.yml
index d213b546..0472c806 100644
--- a/modules/varbase_features/varbase_admin/varbase_admin.info.yml
+++ b/modules/varbase_features/varbase_admin/varbase_admin.info.yml
@@ -5,6 +5,7 @@ dependencies:
- admin_toolbar
- admin_toolbar_tools
- adminimal_admin_toolbar
+ - config_perms
- mail_edit
- masquerade
- menu_admin_per_menu
diff --git a/modules/varbase_features/varbase_admin/varbase_admin.install b/modules/varbase_features/varbase_admin/varbase_admin.install
index b4a74d05..2aee9cfb 100644
--- a/modules/varbase_features/varbase_admin/varbase_admin.install
+++ b/modules/varbase_features/varbase_admin/varbase_admin.install
@@ -85,3 +85,12 @@ function varbase_admin_update_8009() {
\Drupal::service('module_installer')->install(['menu_admin_per_menu'], FALSE);
}
}
+
+/**
+ * Enable Custom Permissions module.
+ */
+function varbase_admin_update_8010() {
+ if (!\Drupal::moduleHandler()->moduleExists('config_perms')) {
+ \Drupal::service('module_installer')->install(['config_perms'], FALSE);
+ }
+}
--
GitLab