From 9af44fe1ad8c76e390d2dec700ea3f7714b55789 Mon Sep 17 00:00:00 2001 From: doishub Date: Fri, 22 Dec 2023 15:50:05 +0100 Subject: [PATCH] Revert develop --- README.md | 2 +- composer.json | 2 +- contao/dca/tl_module.php | 2 +- contao/languages/de/tl_recommendation.xlf | 8 ------- contao/languages/en/tl_recommendation.xlf | 6 ----- contao/modules/ModuleRecommendation.php | 23 ------------------- .../recommendation_default.html5 | 8 ------- .../recommendation/recommendation_full.html5 | 8 ------- .../recommendation_latest.html5 | 8 ------- 9 files changed, 3 insertions(+), 64 deletions(-) diff --git a/README.md b/README.md index 1f71414..e3e46df 100644 --- a/README.md +++ b/README.md @@ -165,7 +165,7 @@ The recommendation list can display published (and verified) recommendations fro Meta fields - Here you can select meta fields to display

(Additional data utilizes the *addAdditionalRecommendationData* Hook and includes data from other plugins.) + Here you can select meta fields to display Recommendation template diff --git a/composer.json b/composer.json index fc54288..f6a8420 100644 --- a/composer.json +++ b/composer.json @@ -61,7 +61,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.5.x-dev" + "dev-main": "1.4.x-dev" }, "contao-manager-plugin": "Oveleon\\ContaoRecommendationBundle\\ContaoManager\\Plugin" }, diff --git a/contao/dca/tl_module.php b/contao/dca/tl_module.php index 0ec2f5e..131df1b 100644 --- a/contao/dca/tl_module.php +++ b/contao/dca/tl_module.php @@ -66,7 +66,7 @@ 'default' => ['date', 'author'], 'exclude' => true, 'inputType' => 'checkbox', - 'options' => ['image', 'date', 'author', 'rating', 'location', 'customField', 'additionalData'], + 'options' => ['image', 'date', 'author', 'rating', 'location', 'customField'], 'reference' => &$GLOBALS['TL_LANG']['tl_recommendation'], 'eval' => ['multiple'=>true], 'sql' => "varchar(255) NOT NULL default ''" diff --git a/contao/languages/de/tl_recommendation.xlf b/contao/languages/de/tl_recommendation.xlf index 97eab09..ae10a48 100644 --- a/contao/languages/de/tl_recommendation.xlf +++ b/contao/languages/de/tl_recommendation.xlf @@ -69,14 +69,6 @@ Here you can add additional text that should be displayed within the recommendation. Hier können Sie einen zusätzlichen Text hinzufügen, der in der Bewertung angezeigt werden soll. - - Additional data - Weitere Daten - - - This option can be used to display data from other plugins. - Diese Option kann verwendet werden, um Daten aus anderen Plugins anzuzeigen. - Recommendation teaser Teasertext diff --git a/contao/languages/en/tl_recommendation.xlf b/contao/languages/en/tl_recommendation.xlf index c0d164c..2849d0b 100644 --- a/contao/languages/en/tl_recommendation.xlf +++ b/contao/languages/en/tl_recommendation.xlf @@ -52,12 +52,6 @@ Here you can add additional text that should be displayed within the recommendation. - - Additional data - - - This option can be used to display data from other plugins. - Recommendation teaser diff --git a/contao/modules/ModuleRecommendation.php b/contao/modules/ModuleRecommendation.php index d69ccdd..c58ad0f 100644 --- a/contao/modules/ModuleRecommendation.php +++ b/contao/modules/ModuleRecommendation.php @@ -120,25 +120,6 @@ protected function parseRecommendation(RecommendationModel $objRecommendation, R // Parsing image meta field to template for backwards compatibility // Works for recommendation_default.html5 $objTemplate->addRecommendationImage = array_key_exists('image', $arrMeta); - // Add extra information that can be parsed with class and value - $additionalData = []; - - // HOOK: add custom logic - if ( - isset($arrMeta['additionalData']) && - isset($GLOBALS['TL_HOOKS']['addAdditionalRecommendationData']) && - \is_array($GLOBALS['TL_HOOKS']['addAdditionalRecommendationData']) - ) - { - foreach ($GLOBALS['TL_HOOKS']['addAdditionalRecommendationData'] as $callback) - { - $this->import($callback[0]); - $this->{$callback[0]}->{$callback[1]}($objTemplate, $objRecommendation->row(), $additionalData, $this); - } - } - - $objTemplate->recommendationAdditional = $additionalData; - $container = System::getContainer(); // Add an image @@ -244,10 +225,6 @@ protected function getMetaFields(RecommendationModel $objRecommendation): array $return['image'] = true; break; - case 'additionalData': - $return['additionalData'] = true; - break; - default: $return[ $field ] = $objRecommendation->{$field}; } diff --git a/contao/templates/recommendation/recommendation_default.html5 b/contao/templates/recommendation/recommendation_default.html5 index d86ebed..8d78357 100644 --- a/contao/templates/recommendation/recommendation_default.html5 +++ b/contao/templates/recommendation/recommendation_default.html5 @@ -49,14 +49,6 @@ - recommendationAdditional): ?> -
- -
- -
- - allowRedirect): ?>

more ?>

diff --git a/contao/templates/recommendation/recommendation_full.html5 b/contao/templates/recommendation/recommendation_full.html5 index 2ac425f..15d1ec2 100644 --- a/contao/templates/recommendation/recommendation_full.html5 +++ b/contao/templates/recommendation/recommendation_full.html5 @@ -44,12 +44,4 @@ text ?> - recommendationAdditional): ?> -
- -
- -
- - diff --git a/contao/templates/recommendation/recommendation_latest.html5 b/contao/templates/recommendation/recommendation_latest.html5 index 6790d67..7b9f35c 100644 --- a/contao/templates/recommendation/recommendation_latest.html5 +++ b/contao/templates/recommendation/recommendation_latest.html5 @@ -44,14 +44,6 @@ - recommendationAdditional): ?> -
- -
- -
- - allowRedirect): ?>

more ?>