From 46845c6f2192bccf00c1031eb1b42cbd63c7dc4b Mon Sep 17 00:00:00 2001
From: "lee.5151" <lee.5151@osu.edu>
Date: Mon, 29 Jan 2024 10:01:52 -0500
Subject: [PATCH] Upgrading drupal/inline_entity_form (1.0.0-rc15 =>
1.0.0-rc17)
---
composer.json | 2 +-
composer.lock | 20 +++++++++-------
vendor/composer/installed.json | 24 +++++++++----------
vendor/composer/installed.php | 10 ++++----
.../inline_entity_form.info.yml | 6 ++---
.../FieldWidget/InlineEntityFormBase.php | 2 +-
.../inline_entity_form_test.info.yml | 6 ++---
...line_entity_form_translation_test.info.yml | 6 ++---
8 files changed, 40 insertions(+), 36 deletions(-)
diff --git a/composer.json b/composer.json
index dc92cd0788..de184314ef 100644
--- a/composer.json
+++ b/composer.json
@@ -125,7 +125,7 @@
"drupal/google_tag": "1.6",
"drupal/honeypot": "2.1.3",
"drupal/imagecache_external": "^3.0",
- "drupal/inline_entity_form": "1.0-rc15",
+ "drupal/inline_entity_form": "1.0-rc17",
"drupal/libraries": "^4.0",
"drupal/link_attributes": "^2.1",
"drupal/linkit": "^6.1",
diff --git a/composer.lock b/composer.lock
index 8545e8ed90..ab7a27390e 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": "a9e03f5a392cb0d81c9078d894820969",
+ "content-hash": "57b59468a50f5a109ade9003c487d9d5",
"packages": [
{
"name": "asm89/stack-cors",
@@ -3711,17 +3711,17 @@
},
{
"name": "drupal/inline_entity_form",
- "version": "1.0.0-rc15",
+ "version": "1.0.0-rc17",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/inline_entity_form.git",
- "reference": "8.x-1.0-rc15"
+ "reference": "8.x-1.0-rc17"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/inline_entity_form-8.x-1.0-rc15.zip",
- "reference": "8.x-1.0-rc15",
- "shasum": "7702801f7e599956fc3d10cff8257809f53ac3ec"
+ "url": "https://ftp.drupal.org/files/projects/inline_entity_form-8.x-1.0-rc17.zip",
+ "reference": "8.x-1.0-rc17",
+ "shasum": "626622e01cf7a2d2977fdc06ae09afd5a814e09b"
},
"require": {
"drupal/core": "^8.8 || ^9 || ^10",
@@ -3733,8 +3733,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.0-rc15",
- "datestamp": "1678126675",
+ "version": "8.x-1.0-rc17",
+ "datestamp": "1703020130",
"security-coverage": {
"status": "not-covered",
"message": "RC releases are not covered by Drupal security advisories."
@@ -3758,6 +3758,10 @@
"name": "dawehner",
"homepage": "https://www.drupal.org/user/99340"
},
+ {
+ "name": "dww",
+ "homepage": "https://www.drupal.org/user/46549"
+ },
{
"name": "geek-merlin",
"homepage": "https://www.drupal.org/user/229048"
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 454a19a5b6..bc2c34f644 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -3891,18 +3891,18 @@
},
{
"name": "drupal/inline_entity_form",
- "version": "1.0.0-rc15",
- "version_normalized": "1.0.0.0-RC15",
+ "version": "1.0.0-rc17",
+ "version_normalized": "1.0.0.0-RC17",
"source": {
"type": "git",
"url": "https://git.drupalcode.org/project/inline_entity_form.git",
- "reference": "8.x-1.0-rc15"
+ "reference": "8.x-1.0-rc17"
},
"dist": {
"type": "zip",
- "url": "https://ftp.drupal.org/files/projects/inline_entity_form-8.x-1.0-rc15.zip",
- "reference": "8.x-1.0-rc15",
- "shasum": "7702801f7e599956fc3d10cff8257809f53ac3ec"
+ "url": "https://ftp.drupal.org/files/projects/inline_entity_form-8.x-1.0-rc17.zip",
+ "reference": "8.x-1.0-rc17",
+ "shasum": "626622e01cf7a2d2977fdc06ae09afd5a814e09b"
},
"require": {
"drupal/core": "^8.8 || ^9 || ^10",
@@ -3914,8 +3914,8 @@
"type": "drupal-module",
"extra": {
"drupal": {
- "version": "8.x-1.0-rc15",
- "datestamp": "1678126675",
+ "version": "8.x-1.0-rc17",
+ "datestamp": "1703020130",
"security-coverage": {
"status": "not-covered",
"message": "RC releases are not covered by Drupal security advisories."
@@ -3940,6 +3940,10 @@
"name": "dawehner",
"homepage": "https://www.drupal.org/user/99340"
},
+ {
+ "name": "dww",
+ "homepage": "https://www.drupal.org/user/46549"
+ },
{
"name": "geek-merlin",
"homepage": "https://www.drupal.org/user/229048"
@@ -3952,10 +3956,6 @@
"name": "jsacksick",
"homepage": "https://www.drupal.org/user/972218"
},
- {
- "name": "kaythay",
- "homepage": "https://www.drupal.org/user/2182186"
- },
{
"name": "oknate",
"homepage": "https://www.drupal.org/user/471638"
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
index fef777faf3..371e19990f 100644
--- a/vendor/composer/installed.php
+++ b/vendor/composer/installed.php
@@ -3,7 +3,7 @@
'name' => 'osu-asc-webservices/d8-upstream',
'pretty_version' => 'dev-main',
'version' => 'dev-main',
- 'reference' => '0cbe707752b00b46d377cf6b689ad3923de32764',
+ 'reference' => '0bfbe2fdc5b9abb0a74274279580e5fe37e280ee',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
@@ -701,9 +701,9 @@
'dev_requirement' => false,
),
'drupal/inline_entity_form' => array(
- 'pretty_version' => '1.0.0-rc15',
- 'version' => '1.0.0.0-RC15',
- 'reference' => '8.x-1.0-rc15',
+ 'pretty_version' => '1.0.0-rc17',
+ 'version' => '1.0.0.0-RC17',
+ 'reference' => '8.x-1.0-rc17',
'type' => 'drupal-module',
'install_path' => __DIR__ . '/../../web/modules/inline_entity_form',
'aliases' => array(),
@@ -1411,7 +1411,7 @@
'osu-asc-webservices/d8-upstream' => array(
'pretty_version' => 'dev-main',
'version' => 'dev-main',
- 'reference' => '0cbe707752b00b46d377cf6b689ad3923de32764',
+ 'reference' => '0bfbe2fdc5b9abb0a74274279580e5fe37e280ee',
'type' => 'project',
'install_path' => __DIR__ . '/../../',
'aliases' => array(),
diff --git a/web/modules/inline_entity_form/inline_entity_form.info.yml b/web/modules/inline_entity_form/inline_entity_form.info.yml
index 3894dfe370..e71cd4a766 100644
--- a/web/modules/inline_entity_form/inline_entity_form.info.yml
+++ b/web/modules/inline_entity_form/inline_entity_form.info.yml
@@ -5,7 +5,7 @@ package: Fields
core_version_requirement: ^8.8 || ^9 || ^10
php: 7.1
-# Information added by Drupal.org packaging script on 2023-03-06
-version: '8.x-1.0-rc15'
+# Information added by Drupal.org packaging script on 2023-12-19
+version: '8.x-1.0-rc17'
project: 'inline_entity_form'
-datestamp: 1678126677
+datestamp: 1703020132
diff --git a/web/modules/inline_entity_form/src/Plugin/Field/FieldWidget/InlineEntityFormBase.php b/web/modules/inline_entity_form/src/Plugin/Field/FieldWidget/InlineEntityFormBase.php
index 592ece30d6..450fcd9ca8 100644
--- a/web/modules/inline_entity_form/src/Plugin/Field/FieldWidget/InlineEntityFormBase.php
+++ b/web/modules/inline_entity_form/src/Plugin/Field/FieldWidget/InlineEntityFormBase.php
@@ -468,7 +468,7 @@ protected function getInlineEntityForm($operation, $bundle, $langcode, $delta, a
* @todo Replace line 472 \Drupal call with Dependency Injection.
*/
protected function isTranslating(FormStateInterface $form_state) {
- if (TranslationHelper::isTranslating($form_state)) {
+ if (\Drupal::hasService('content_translation.manager') && TranslationHelper::isTranslating($form_state)) {
$translation_manager = \Drupal::service('content_translation.manager');
$target_type = $this->getFieldSetting('target_type');
foreach ($this->getTargetBundles() as $bundle) {
diff --git a/web/modules/inline_entity_form/tests/modules/inline_entity_form_test/inline_entity_form_test.info.yml b/web/modules/inline_entity_form/tests/modules/inline_entity_form_test/inline_entity_form_test.info.yml
index ca024b27f0..41ecff0839 100644
--- a/web/modules/inline_entity_form/tests/modules/inline_entity_form_test/inline_entity_form_test.info.yml
+++ b/web/modules/inline_entity_form/tests/modules/inline_entity_form_test/inline_entity_form_test.info.yml
@@ -9,7 +9,7 @@ dependencies:
- drupal:file
- drupal:image
-# Information added by Drupal.org packaging script on 2023-03-06
-version: '8.x-1.0-rc15'
+# Information added by Drupal.org packaging script on 2023-12-19
+version: '8.x-1.0-rc17'
project: 'inline_entity_form'
-datestamp: 1678126677
+datestamp: 1703020132
diff --git a/web/modules/inline_entity_form/tests/modules/inline_entity_form_translation_test/inline_entity_form_translation_test.info.yml b/web/modules/inline_entity_form/tests/modules/inline_entity_form_translation_test/inline_entity_form_translation_test.info.yml
index 513bd67377..6954c278f2 100644
--- a/web/modules/inline_entity_form/tests/modules/inline_entity_form_translation_test/inline_entity_form_translation_test.info.yml
+++ b/web/modules/inline_entity_form/tests/modules/inline_entity_form_translation_test/inline_entity_form_translation_test.info.yml
@@ -8,7 +8,7 @@ dependencies:
- drupal:language
- drupal:content_translation
-# Information added by Drupal.org packaging script on 2023-03-06
-version: '8.x-1.0-rc15'
+# Information added by Drupal.org packaging script on 2023-12-19
+version: '8.x-1.0-rc17'
project: 'inline_entity_form'
-datestamp: 1678126677
+datestamp: 1703020132
--
GitLab