From 263576c5aae77d34fecb5537f2b77434d24b26d6 Mon Sep 17 00:00:00 2001
From: Rajab Natshah <rajabn@gmail.com>
Date: Sun, 8 Apr 2018 20:01:26 +0300
Subject: [PATCH] Issue #2959483: Changed [Varbase Profile] modules and config
to work with [Media] Drupal core module
---
composer.json | 13 +++++++------
config/install/features.bundle.varbase.yml | 7 ++++---
.../field.storage.block_content.field_image.yml | 2 +-
.../field.storage.block_content.field_images.yml | 4 ++--
config/install/field.storage.node.field_image.yml | 2 +-
.../install/field.storage.node.field_images.yml | 2 +-
.../field.storage.taxonomy_term.field_image.yml | 2 +-
drupal-org.make | 15 +++------------
varbase.info.yml | 4 +---
9 files changed, 21 insertions(+), 30 deletions(-)
diff --git a/composer.json b/composer.json
index 38f37213..9cff79f9 100644
--- a/composer.json
+++ b/composer.json
@@ -52,14 +52,11 @@
"drupal/embed": "1.0",
"drupal/entity": "1.0-beta3",
"drupal/entity_clone": "1.x-dev#9265e359bd31bda693dac9ad84ad52fe63531488",
- "drupal/entity_browser": "1.4",
- "drupal/dropzonejs": "1.0-alpha8",
+ "drupal/entity_browser": "2.0-alpha2",
+ "drupal/dropzonejs": "2.0-alpha3",
"drupal/entity_embed": "1.0-beta2",
"drupal/inline_entity_form": "1.0-beta1",
- "drupal/media_entity": "1.7",
- "drupal/media_entity_document": "1.1",
- "drupal/media_entity_image": "1.2",
- "drupal/video_embed_field": "1.5",
+ "drupal/video_embed_field": "2.0-alpha2",
"drupal/crop": "1.5",
"drupal/focal_point": "1.0-beta6",
"drupal/pathologic": "1.x-dev#4f9f3fdcf1e0b224c4d8650e383a769f40abf9bf",
@@ -378,6 +375,10 @@
"drupal/login_destination": {
"Issue #2947616: Fixed SetOptions on null causing error.":
"https://www.drupal.org/files/issues/2018-03-09/toolbar_alter_error-2947616-11.patch"
+ },
+ "drupal/rabbit_hole": {
+ "Issue #2918563: rh_media submodule compatible with core media?":
+ "https://www.drupal.org/files/issues/rh_media-upgrade-drupal8.4.2-2918563-6.patch"
}
}
}
diff --git a/config/install/features.bundle.varbase.yml b/config/install/features.bundle.varbase.yml
index 9f8ba041..bfd042dc 100644
--- a/config/install/features.bundle.varbase.yml
+++ b/config/install/features.bundle.varbase.yml
@@ -52,6 +52,7 @@ assignments:
optional:
types:
config:
+ block: block
language_content_settings: language_content_settings
configurable_language: configurable_language
enabled: true
@@ -121,8 +122,8 @@ assignments:
alter:
enabled: true
weight: 0
- core: 1
- uuid: 1
- user_permissions: 0
+ core: true
+ uuid: true
+ user_permissions: false
profile_name: varbase
is_profile: false
diff --git a/config/install/field.storage.block_content.field_image.yml b/config/install/field.storage.block_content.field_image.yml
index feeb2efc..b7967a3b 100644
--- a/config/install/field.storage.block_content.field_image.yml
+++ b/config/install/field.storage.block_content.field_image.yml
@@ -3,7 +3,7 @@ status: true
dependencies:
module:
- block_content
- - media_entity
+ - media
id: block_content.field_image
field_name: field_image
entity_type: block_content
diff --git a/config/install/field.storage.block_content.field_images.yml b/config/install/field.storage.block_content.field_images.yml
index cdc9d7c4..7beaa9a8 100644
--- a/config/install/field.storage.block_content.field_images.yml
+++ b/config/install/field.storage.block_content.field_images.yml
@@ -4,7 +4,7 @@ status: true
dependencies:
module:
- block_content
- - media_entity
+ - media
id: block_content.field_images
field_name: field_images
entity_type: block_content
@@ -17,4 +17,4 @@ cardinality: -1
translatable: true
indexes: { }
persist_with_no_fields: false
-custom_storage: false
\ No newline at end of file
+custom_storage: false
diff --git a/config/install/field.storage.node.field_image.yml b/config/install/field.storage.node.field_image.yml
index b7b577fb..fb7da736 100644
--- a/config/install/field.storage.node.field_image.yml
+++ b/config/install/field.storage.node.field_image.yml
@@ -2,7 +2,7 @@ langcode: en
status: true
dependencies:
module:
- - media_entity
+ - media
- node
id: node.field_image
field_name: field_image
diff --git a/config/install/field.storage.node.field_images.yml b/config/install/field.storage.node.field_images.yml
index e6e55e18..8977e7f5 100644
--- a/config/install/field.storage.node.field_images.yml
+++ b/config/install/field.storage.node.field_images.yml
@@ -2,7 +2,7 @@ langcode: en
status: true
dependencies:
module:
- - media_entity
+ - media
- node
id: node.field_images
field_name: field_images
diff --git a/config/install/field.storage.taxonomy_term.field_image.yml b/config/install/field.storage.taxonomy_term.field_image.yml
index c041f567..18a186dc 100644
--- a/config/install/field.storage.taxonomy_term.field_image.yml
+++ b/config/install/field.storage.taxonomy_term.field_image.yml
@@ -3,7 +3,7 @@ langcode: en
status: true
dependencies:
module:
- - media_entity
+ - media
- taxonomy
id: taxonomy_term.field_image
field_name: field_image
diff --git a/drupal-org.make b/drupal-org.make
index 7d6a9a95..d6ea3f41 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -102,10 +102,10 @@ projects[entity_clone][patch][] = https://www.drupal.org/files/issues/entity_clo
projects[entity_clone][patch][] = https://www.drupal.org/files/issues/entity_clone-abort_clone_causes_fatal_error-2769823-4.patch
projects[entity_browser][type] = module
-projects[entity_browser][version] = 1.4
+projects[entity_browser][version] = 2.0-alpha2
projects[dropzonejs][type] = module
-projects[dropzonejs][version] = 1.0-alpha8
+projects[dropzonejs][version] = 2.0-alpha3
projects[entity_embed][type] = module
projects[entity_embed][version] = 1.0-beta2
@@ -113,17 +113,8 @@ projects[entity_embed][version] = 1.0-beta2
projects[inline_entity_form][type] = module
projects[inline_entity_form][version] = 1.0-beta1
-projects[media_entity][type] = module
-projects[media_entity][version] = 1.7
-
-projects[media_entity_document][type] = module
-projects[media_entity_document][version] = 1.1
-
-projects[media_entity_image][type] = module
-projects[media_entity_image][version] = 1.2
-
projects[video_embed_field][type] = module
-projects[video_embed_field][version] = 1.5
+projects[video_embed_field][version] = 2.0-alpha2
projects[crop][type] = module
projects[crop][version] = 1.5
diff --git a/varbase.info.yml b/varbase.info.yml
index 3284503e..1e3ab94b 100755
--- a/varbase.info.yml
+++ b/varbase.info.yml
@@ -85,9 +85,7 @@ dependencies:
- dropzonejs_eb_widget
- entity_embed
- inline_entity_form
- - media_entity
- - media_entity_document
- - media_entity_image
+ - media
- video_embed_media
- video_embed_wysiwyg
- crop
--
GitLab