From 5c38b6d31fb71f90a28832dac450f8d446683512 Mon Sep 17 00:00:00 2001 From: Andreas Siekkeris Date: Mon, 16 Aug 2021 19:43:40 +0300 Subject: [PATCH 1/4] Fix issue with array to string conversion (Task #20626) --- .../Provider/RenderInput/BelongsToManyRenderer.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/FieldHandlers/Provider/RenderInput/BelongsToManyRenderer.php b/src/FieldHandlers/Provider/RenderInput/BelongsToManyRenderer.php index ec772c6f7..7a5de702b 100644 --- a/src/FieldHandlers/Provider/RenderInput/BelongsToManyRenderer.php +++ b/src/FieldHandlers/Provider/RenderInput/BelongsToManyRenderer.php @@ -40,7 +40,12 @@ public function provide($data = null, array $options = []) $fieldName = $table->aliasField($field); - $relatedProperties = $this->_getRelatedProperties($options['fieldDefinitions']->getLimit(), (string)$data); + if (!is_string($data)) { + $relatedProperties = $this->_getRelatedProperties($options['fieldDefinitions']->getLimit(), ''); + } else { + $relatedProperties = $this->_getRelatedProperties($options['fieldDefinitions']->getLimit(), $data); + } + if (!empty($relatedProperties['dispFieldVal']) && !empty($relatedProperties['config']['parent']['module'])) { $relatedParentProperties = $this->_getRelatedParentProperties($relatedProperties); if (!empty($relatedParentProperties['dispFieldVal'])) { From 1b5dfce87cdf2ab3a3a879b715614a470fcf4c7b Mon Sep 17 00:00:00 2001 From: Andreas Siekkeris Date: Mon, 16 Aug 2021 19:53:18 +0300 Subject: [PATCH 2/4] Refactor code (Task #20626) --- .../Provider/RenderInput/BelongsToManyRenderer.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/FieldHandlers/Provider/RenderInput/BelongsToManyRenderer.php b/src/FieldHandlers/Provider/RenderInput/BelongsToManyRenderer.php index 7a5de702b..50b23fb40 100644 --- a/src/FieldHandlers/Provider/RenderInput/BelongsToManyRenderer.php +++ b/src/FieldHandlers/Provider/RenderInput/BelongsToManyRenderer.php @@ -40,12 +40,7 @@ public function provide($data = null, array $options = []) $fieldName = $table->aliasField($field); - if (!is_string($data)) { - $relatedProperties = $this->_getRelatedProperties($options['fieldDefinitions']->getLimit(), ''); - } else { - $relatedProperties = $this->_getRelatedProperties($options['fieldDefinitions']->getLimit(), $data); - } - + $relatedProperties = $this->_getRelatedProperties($options['fieldDefinitions']->getLimit(), (!is_string($data)) ? '' : $data); if (!empty($relatedProperties['dispFieldVal']) && !empty($relatedProperties['config']['parent']['module'])) { $relatedParentProperties = $this->_getRelatedParentProperties($relatedProperties); if (!empty($relatedParentProperties['dispFieldVal'])) { From d45cec45bce3e7adbd7c0e3d6094f119be319ec4 Mon Sep 17 00:00:00 2001 From: Andreas Siekkeris Date: Mon, 16 Aug 2021 20:03:30 +0300 Subject: [PATCH 3/4] Issue with line characters (Task #20626) --- .../Provider/RenderInput/BelongsToManyRenderer.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/FieldHandlers/Provider/RenderInput/BelongsToManyRenderer.php b/src/FieldHandlers/Provider/RenderInput/BelongsToManyRenderer.php index 50b23fb40..357be0220 100644 --- a/src/FieldHandlers/Provider/RenderInput/BelongsToManyRenderer.php +++ b/src/FieldHandlers/Provider/RenderInput/BelongsToManyRenderer.php @@ -40,7 +40,9 @@ public function provide($data = null, array $options = []) $fieldName = $table->aliasField($field); - $relatedProperties = $this->_getRelatedProperties($options['fieldDefinitions']->getLimit(), (!is_string($data)) ? '' : $data); + $data = (!is_string($data)) ? '' : $data; + + $relatedProperties = $this->_getRelatedProperties($options['fieldDefinitions']->getLimit(), $data); if (!empty($relatedProperties['dispFieldVal']) && !empty($relatedProperties['config']['parent']['module'])) { $relatedParentProperties = $this->_getRelatedParentProperties($relatedProperties); if (!empty($relatedParentProperties['dispFieldVal'])) { From 8593801ed6e4e2d377354e3b4530b724e8a13b42 Mon Sep 17 00:00:00 2001 From: Andreas Siekkeris Date: Mon, 16 Aug 2021 20:06:12 +0300 Subject: [PATCH 4/4] Remove parenthesis (Task #20626) --- .../Provider/RenderInput/BelongsToManyRenderer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/FieldHandlers/Provider/RenderInput/BelongsToManyRenderer.php b/src/FieldHandlers/Provider/RenderInput/BelongsToManyRenderer.php index 357be0220..cf65f888b 100644 --- a/src/FieldHandlers/Provider/RenderInput/BelongsToManyRenderer.php +++ b/src/FieldHandlers/Provider/RenderInput/BelongsToManyRenderer.php @@ -40,7 +40,7 @@ public function provide($data = null, array $options = []) $fieldName = $table->aliasField($field); - $data = (!is_string($data)) ? '' : $data; + $data = !is_string($data) ? '' : $data; $relatedProperties = $this->_getRelatedProperties($options['fieldDefinitions']->getLimit(), $data); if (!empty($relatedProperties['dispFieldVal']) && !empty($relatedProperties['config']['parent']['module'])) {