From cfbdb8e0080c0c4896e30e96cbce9176d82f4149 Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Tue, 5 Mar 2024 17:54:33 +0100 Subject: [PATCH] wait #6769 @0.25 --- app/Fluidbook/Link/LinksData.php | 20 ++++++++++++++++++++ app/Models/Traits/PublicationSettings.php | 1 + 2 files changed, 21 insertions(+) diff --git a/app/Fluidbook/Link/LinksData.php b/app/Fluidbook/Link/LinksData.php index 7213e2d00..b98962640 100644 --- a/app/Fluidbook/Link/LinksData.php +++ b/app/Fluidbook/Link/LinksData.php @@ -196,6 +196,10 @@ class LinksData $links = Link::encryptLinks($links); } + if ($meta['version'] < 3) { + self::_fixV2Links($links); + } + self::_fixLinks($links); } else { $links = []; @@ -273,6 +277,22 @@ class LinksData self::_fixInlineSlideshows($links); } + protected static function _fixV2Links(&$links) + { + self::_fixV2TooltipLinks($links); + } + + protected static function _fixV2TooltipLinks(&$links) + { + foreach ($links as $k => $link) { + if ($link['type'] == Link::TOOLTIP && !$link['inline']) { + $links[$k]['type'] = Link::TEXT_POPUP; + $links[$k]['to'] = $link['infobulle']; + $links[$k]['infobulle'] = $links[$k]['tooltip'] = ''; + } + } + } + protected static function _fixInlineSlideshows(&$links) { foreach ($links as $k => $link) { diff --git a/app/Models/Traits/PublicationSettings.php b/app/Models/Traits/PublicationSettings.php index 105abc5dd..0ed052a71 100644 --- a/app/Models/Traits/PublicationSettings.php +++ b/app/Models/Traits/PublicationSettings.php @@ -1960,6 +1960,7 @@ trait PublicationSettings $this->addSettingField('disableDemo', Checkbox::class, $this->__('Désactiver le lien de démo'), [ 'v2' => '{"type":"boolean","default":false,"editable":true,"label":"\\u00a7!\\u00a7D\\u00e9sactiver le lien de d\\u00e9mo!\\u00a7!","grade":5}', 'default' => false, + 'hint' => __('Si désactivé, le lien n\'est accessible qu\'aux utilisateurs connectés'), ]); $this->addSettingField('redirectDemo', LongText::class, $this->__('Rediriger le lien de démo vers'), [ 'v2' => '{"type":"text","default":"","editable":true,"label":"\\u00a7!\\u00a7Rediriger le lien de d\\u00e9mo vers!\\u00a7!","grade":5}', -- 2.39.5