From ef77c2b0cda9c53619a5a4342b3d38108f58decc Mon Sep 17 00:00:00 2001
From: Rajab Natshah <rajabn@gmail.com>
Date: Tue, 9 May 2017 19:53:41 +0300
Subject: [PATCH] Issue #2877053: Add [Taxonomy access fix] module

---
 composer.json                                          |  1 +
 drupal-org.make                                        |  3 +++
 .../varbase_admin/varbase_admin.info.yml               |  2 ++
 .../varbase_admin/varbase_admin.install                | 10 ++++++++++
 varbase.info.yml                                       |  1 -
 varbase.install                                        |  4 ----
 6 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/composer.json b/composer.json
index 0dd108e3..c4a7076d 100644
--- a/composer.json
+++ b/composer.json
@@ -260,6 +260,7 @@
     "drupal/maxlength": "1.0-beta1",
     "drupal/menu_position": "1.x-dev#a337956f24053d337c399ad86c1f78d4d4235702",
     "drupal/mail_edit": "1.x-dev#bcd0041830d8581b36e6211f0c8eabd8caf9652b",
+    "drupal/taxonomy_access_fix": "2.1",
     "drupal/libraries": "3.x-dev#061ead081c92a6209b09eaf23b4e3103f360946e",
     "drupal/layout_plugin": "1.0-alpha23",
     "drupal/xmlsitemap": "1.0-alpha2",
diff --git a/drupal-org.make b/drupal-org.make
index bd146da9..5264778c 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -193,6 +193,9 @@ projects[mail_edit][download][url] = https://git.drupal.org/project/mail_edit.gi
 projects[mail_edit][download][revision] = bcd0041830d8581b36e6211f0c8eabd8caf9652b
 projects[mail_edit][download][branch] = 8.x-1.x
 
+projects[taxonomy_access_fix][type] = module
+projects[taxonomy_access_fix][version] = 2.1
+
 ;;;;;;;;;;;;;;;;;;;;;
 ;; Contrib modules for Varbase SEO.
 ;;;;;;;;;;;;;;;;;;;;;
diff --git a/modules/varbase_features/varbase_admin/varbase_admin.info.yml b/modules/varbase_features/varbase_admin/varbase_admin.info.yml
index d27c5fba..85e77032 100644
--- a/modules/varbase_features/varbase_admin/varbase_admin.info.yml
+++ b/modules/varbase_features/varbase_admin/varbase_admin.info.yml
@@ -5,10 +5,12 @@ dependencies:
   - admin_toolbar
   - admin_toolbar_tools
   - adminimal_admin_toolbar
+  - mail_edit
   - masquerade
   - node
   - responsive_preview
   - roleassign
+  - taxonomy_access_fix
   - user
   - userprotect
   - views
diff --git a/modules/varbase_features/varbase_admin/varbase_admin.install b/modules/varbase_features/varbase_admin/varbase_admin.install
index 9a96292d..5c981200 100644
--- a/modules/varbase_features/varbase_admin/varbase_admin.install
+++ b/modules/varbase_features/varbase_admin/varbase_admin.install
@@ -37,4 +37,14 @@ function varbase_admin_update_8001() {
   if (!\Drupal::moduleHandler()->moduleExists('responsive_preview')) {
     \Drupal::service('module_installer')->install(['responsive_preview'], FALSE);
   }
+  
+  // Enable Mail Editor module.
+  if (!\Drupal::moduleHandler()->moduleExists('mail_edit')) {
+    \Drupal::service('module_installer')->install(['mail_edit'], FALSE);
+  }
+  
+  // Enable Taxonomy access fix module.
+  if (!\Drupal::moduleHandler()->moduleExists('taxonomy_access_fix')) {
+    \Drupal::service('module_installer')->install(['taxonomy_access_fix'], FALSE);
+  }
 }
\ No newline at end of file
diff --git a/varbase.info.yml b/varbase.info.yml
index 554429ac..d1e038b0 100644
--- a/varbase.info.yml
+++ b/varbase.info.yml
@@ -102,7 +102,6 @@ dependencies:
   - smtp
   - maxlength
   - menu_position
-  - mail_edit
 
 themes:
   # Contrib themes.
diff --git a/varbase.install b/varbase.install
index 92ba9624..153d4ee6 100644
--- a/varbase.install
+++ b/varbase.install
@@ -267,8 +267,4 @@ function varbase_update_8003() {
     \Drupal::service('module_installer')->install(['menu_position'], FALSE);
   }
 
-  // Enable Mail Editor module.
-  if (!\Drupal::moduleHandler()->moduleExists('mail_edit')) {
-    \Drupal::service('module_installer')->install(['mail_edit'], FALSE);
-  }
 }
-- 
GitLab