From 6bd8744899accd66a8e8fa0846935eb4d560e893 Mon Sep 17 00:00:00 2001 From: Markus Weigelt Date: Fri, 18 Oct 2024 18:19:35 +0200 Subject: [PATCH 1/7] Update Typo12 --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 0192941..6924114 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,8 @@ ], "license": "GPL-3.0-or-later", "require": { - "typo3/cms-core": "^10.4|^11.5", + "php": "7.4 - 8.3", + "typo3/cms-core": "^11.5.40|^12.4.21", "kitodo/presentation": "^5.0|dev-master" }, "autoload": { From bfd71ef756cda13c2c719417524e4883588b7d4e Mon Sep 17 00:00:00 2001 From: Markus Weigelt Date: Mon, 21 Oct 2024 14:16:15 +0200 Subject: [PATCH 2/7] Update Typo3 12 --- Configuration/TCA/Overrides/pages.php | 2 +- Configuration/TCA/Overrides/sys_template.php | 2 +- Configuration/TCA/Overrides/tt_content.php | 2 +- Configuration/TsConfig/All.tsconfig | 3 ++- .../TypoScript/Plugin/Kitodo/setup.typoscript | 2 +- .../TypoScript/SitePackage/setup.typoscript | 2 +- Configuration/TypoScript/setup.typoscript | 6 ++---- Resources/Public/Icons/Extension.png | Bin 0 -> 1042 bytes composer.json | 2 +- ext_localconf.php | 3 ++- 10 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 Resources/Public/Icons/Extension.png diff --git a/Configuration/TCA/Overrides/pages.php b/Configuration/TCA/Overrides/pages.php index b9cdbd7..ba1628a 100644 --- a/Configuration/TCA/Overrides/pages.php +++ b/Configuration/TCA/Overrides/pages.php @@ -1,5 +1,5 @@ +@import 'EXT:slub_digitalcollections/Configuration/TsConfig/Mod/WebLayout/BackendLayouts/*.tsconfig' +@import 'EXT:slub_digitalcollections/Configuration/TsConfig/Mod/Wizards/NewContentElement/*.tsconfig' diff --git a/Configuration/TypoScript/Plugin/Kitodo/setup.typoscript b/Configuration/TypoScript/Plugin/Kitodo/setup.typoscript index 9cd45d4..b110c95 100644 --- a/Configuration/TypoScript/Plugin/Kitodo/setup.typoscript +++ b/Configuration/TypoScript/Plugin/Kitodo/setup.typoscript @@ -1,4 +1,4 @@ - +@import 'EXT:slub_digitalcollections/Configuration/TypoScript/Plugin/Kitodo/common.typoscript' plugin.tx_dlf { persistence { diff --git a/Configuration/TypoScript/SitePackage/setup.typoscript b/Configuration/TypoScript/SitePackage/setup.typoscript index a00a763..c2df5b3 100644 --- a/Configuration/TypoScript/SitePackage/setup.typoscript +++ b/Configuration/TypoScript/SitePackage/setup.typoscript @@ -66,4 +66,4 @@ page { } - +@import 'EXT:slub_digitalcollections/Configuration/TypoScript/SitePackage/navigation.typoscript' diff --git a/Configuration/TypoScript/setup.typoscript b/Configuration/TypoScript/setup.typoscript index 5e539ff..7c93511 100644 --- a/Configuration/TypoScript/setup.typoscript +++ b/Configuration/TypoScript/setup.typoscript @@ -142,10 +142,8 @@ page { # -------------------------------------------------------------------------------------------------------------------- # The condition is necessary because you cannot nest TypoScript conditions. But inside the included TypoScript files, # more conditions appear. - - - - +@import 'EXT:slub_digitalcollections/Configuration/TypoScript/Plugin/Kitodo/setup.typoscript' +@import 'EXT:slub_digitalcollections/Configuration/TypoScript/Plugin/singleCollection.typoscript' # -------------------------------------------------------------------------------------------------------------------- # body class overrides # -------------------------------------------------------------------------------------------------------------------- diff --git a/Resources/Public/Icons/Extension.png b/Resources/Public/Icons/Extension.png new file mode 100644 index 0000000000000000000000000000000000000000..ad4f7a79476f0a5abeae7de6fd813c8c5e458b26 GIT binary patch literal 1042 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrV7}?;;uuoF`1Y2w#GM!khllsK z<=zINv$r6Ovf1;NpH?!S{p#N4itWap`-Icyt9XiRjQ!hg#30$gl?!dy2Jck%oDctOP`J$`qhp7IeC>hD)4Lk~GYreRc{^`A5Xx!JIT){RW z&5&&Y-@oI#cL*;(W*EWjv02FZBFE2;s@96&(&5aQ` z41z2Z6#E_*a^E{}e?{ND8TkwolON0WzWyjw=bl<}*oXN>S+Z=?V&$&K1u?DZAC*rn zR$i7A+{1XMndS3E>8l^j?;X&!uv=uocWh~e(EUX$w-S`hT4Wt|EtTllb)vJpP~5Ly zqmQ}JPVV4zjh<%`&83O#6Y^Bs78-tfoP4K$^Tv9W!Z+=k3+?UP>P(Imtl_b4D0ywb zb~aEX{!w5|2eYzO)ttWFADv?um)vgf%;=x=gU|nQk&I9V$8!mXZ_5@NYdsRT+0SjK zVA`YxX_fBUpkAiB0htBZ;6PLJ}j_N|OZ{5}m zYma)EI49QhwHMm)bpW}?UA8zD)^w{EYV!42Gvqp5+`$|m%6wxtQaVXtKuIZ4n#5spCrQ>nM zohI{-=BpN)Ka+M~0SRQpw2ObV)>^2Y2DYT*aX?IG`bXPS3zXH8lOHfjIEbA;qkru2 z52>RUgdT6S`@q1X&}}`f_@jcItE0)$f;DZ7N4gx}bQ>3%-*eBqay&t&nbAe=MCT6K z{73OuT;g?17#>@QU4Jb4r}5N_zME_bGVPDEY}(}mmdKI;Vst0NpmB6aWAK literal 0 HcmV?d00001 diff --git a/composer.json b/composer.json index 6924114..e3db592 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "require": { "php": "7.4 - 8.3", "typo3/cms-core": "^11.5.40|^12.4.21", - "kitodo/presentation": "^5.0|dev-master" + "kitodo/presentation": "@dev" }, "autoload": { "psr-4": { diff --git a/ext_localconf.php b/ext_localconf.php index ae55d11..0046260 100644 --- a/ext_localconf.php +++ b/ext_localconf.php @@ -1,5 +1,5 @@ Date: Mon, 21 Oct 2024 17:40:28 +0200 Subject: [PATCH 3/7] Updates regarding typo3 12 --- Classes/ViewHelpers/XpathViewHelper.php | 6 +---- .../Partials/TableOfContents/Children.html | 5 ++-- .../Kitodo/Templates/Navigation/Main.html | 24 +++++++++---------- .../SingleCollection/Partials/Pagination.html | 10 ++++---- 4 files changed, 20 insertions(+), 25 deletions(-) diff --git a/Classes/ViewHelpers/XpathViewHelper.php b/Classes/ViewHelpers/XpathViewHelper.php index 672240f..b4ec3ca 100644 --- a/Classes/ViewHelpers/XpathViewHelper.php +++ b/Classes/ViewHelpers/XpathViewHelper.php @@ -25,7 +25,6 @@ ***************************************************************/ use TYPO3\CMS\Core\Utility\GeneralUtility; use TYPO3\CMS\Core\Utility\MathUtility; -use TYPO3\CMS\Extbase\Object\ObjectManager; use TYPO3Fluid\Fluid\Core\Rendering\RenderingContextInterface; use TYPO3Fluid\Fluid\Core\ViewHelper\AbstractViewHelper; @@ -144,10 +143,7 @@ public static function renderStatic( private static function getDocumentRepository() { if (null === static::$documentRepository) { - $objectManager = GeneralUtility::makeInstance(ObjectManager::class); - static::$documentRepository = $objectManager->get( - DocumentRepository::class - ); + static::$documentRepository = GeneralUtility::makeInstance(DocumentRepository::class); } return static::$documentRepository; diff --git a/Resources/Private/Plugins/Kitodo/Partials/TableOfContents/Children.html b/Resources/Private/Plugins/Kitodo/Partials/TableOfContents/Children.html index 2783fd9..da67693 100644 --- a/Resources/Private/Plugins/Kitodo/Partials/TableOfContents/Children.html +++ b/Resources/Private/Plugins/Kitodo/Partials/TableOfContents/Children.html @@ -46,8 +46,7 @@ pageUid="{settings.targetPid}" additionalParams="{f:if(condition:'{child.id}', then:'{\'tx_dlf[id]\':child.id, \'tx_dlf[page]\':child.page}', else: '{\'tx_dlf[page]\':child.page}')}" argumentsToBeExcludedFromQueryString="{0: 'tx_dlf[measure]'}" - addQueryString="1" - addQueryStringMethod="GET" + addQueryString="untrusted" title="{f:if(condition:'{child.title}', then: '{child.title}', else: '{child.type}')}"> @@ -61,7 +60,7 @@ action="main" controller="Basket" additionalParams="{'tx_dlf[addToBasket]':'toc', 'tx_dlf[logId]':child.basketButton.logId, 'tx_dlf[startpage]':child.basketButton.startpage, 'tx_dlf_basket[action]':'add', 'tx_dlf_basket[controller]':'Basket'}" - addQueryString="1"> + addQueryString="untrusted"> diff --git a/Resources/Private/Plugins/Kitodo/Templates/Navigation/Main.html b/Resources/Private/Plugins/Kitodo/Templates/Navigation/Main.html index a162425..5cbf153 100644 --- a/Resources/Private/Plugins/Kitodo/Templates/Navigation/Main.html +++ b/Resources/Private/Plugins/Kitodo/Templates/Navigation/Main.html @@ -25,7 +25,7 @@
- @@ -33,7 +33,7 @@
- @@ -47,7 +47,7 @@
- @@ -69,7 +69,7 @@ - @@ -87,7 +87,7 @@ - @@ -105,7 +105,7 @@ - @@ -149,7 +149,7 @@ - @@ -167,7 +167,7 @@ - @@ -185,7 +185,7 @@ - @@ -244,7 +244,7 @@ - + @@ -270,13 +270,13 @@ - + + addQueryString="untrusted" additionalParams="{'tx_dlf[measure]':'1', 'tx_dlf[page]':'{measurePages.1}'}"> diff --git a/Resources/Private/Plugins/SingleCollection/Partials/Pagination.html b/Resources/Private/Plugins/SingleCollection/Partials/Pagination.html index e68d71a..8c05724 100644 --- a/Resources/Private/Plugins/SingleCollection/Partials/Pagination.html +++ b/Resources/Private/Plugins/SingleCollection/Partials/Pagination.html @@ -3,10 +3,10 @@
  • - 1 + 1
    • @@ -43,7 +43,7 @@
  • - {page.label} + {page.label}
    • @@ -53,10 +53,10 @@
  • - {pagination.lastPageNumber} + {pagination.lastPageNumber}
    • From 118c2a3d1104dc91e814a27b2d2482f6778821d0 Mon Sep 17 00:00:00 2001 From: Markus Weigelt Date: Fri, 25 Oct 2024 18:26:46 +0200 Subject: [PATCH 4/7] Remove text from die function, diverse improvements --- Configuration/TCA/Overrides/pages.php | 2 +- Configuration/TCA/Overrides/sys_template.php | 2 +- Configuration/TCA/Overrides/tt_content.php | 2 +- Configuration/TypoScript/setup.typoscript | 4 ++-- ext_emconf.php | 7 ++++--- ext_localconf.php | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Configuration/TCA/Overrides/pages.php b/Configuration/TCA/Overrides/pages.php index ba1628a..6ba75fa 100644 --- a/Configuration/TCA/Overrides/pages.php +++ b/Configuration/TCA/Overrides/pages.php @@ -1,5 +1,5 @@ # render content parts only [END] -[getTSFE().id == {$config.listView}] +[getTSFE() && getTSFE().id == {$config.listView}] page.bodyTag = [END] diff --git a/ext_emconf.php b/ext_emconf.php index bdf4d29..f84f333 100644 --- a/ext_emconf.php +++ b/ext_emconf.php @@ -19,8 +19,9 @@ 'lockType' => '', 'version' => '4.0.0', 'constraints' => array( - 'depends' => array( - 'typo3' => '10.4.99-11.5.99', - ), + 'depends' => [ + 'php' => '7.4.0-8.3.99', + 'typo3' => '11.5.0-12.4.99' + ], ), ); diff --git a/ext_localconf.php b/ext_localconf.php index 0046260..6ac64ed 100644 --- a/ext_localconf.php +++ b/ext_localconf.php @@ -1,5 +1,5 @@ Date: Mon, 28 Oct 2024 17:57:17 +0100 Subject: [PATCH 5/7] Update variable check --- Classes/ViewHelpers/ProviderLogoCachedViewHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/ViewHelpers/ProviderLogoCachedViewHelper.php b/Classes/ViewHelpers/ProviderLogoCachedViewHelper.php index 325850b..2261d07 100644 --- a/Classes/ViewHelpers/ProviderLogoCachedViewHelper.php +++ b/Classes/ViewHelpers/ProviderLogoCachedViewHelper.php @@ -55,7 +55,7 @@ public static function renderStatic( ) { $logoUrl = $arguments['logo']; // is valid uri? - if (GeneralUtility::isValidUrl($logoUrl)) { + if (isset($logoUrl) && GeneralUtility::isValidUrl($logoUrl)) { // calculate cache identifier $logoInfo = pathinfo($logoUrl); $cacheIdentifier = md5($logoUrl) . '.' . $logoInfo['extension']; From 04ca67e9474575ec76b14022ed43947e18a293f4 Mon Sep 17 00:00:00 2001 From: Markus Weigelt Date: Mon, 4 Nov 2024 14:06:50 +0100 Subject: [PATCH 6/7] Add dev --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index e3db592..ae16724 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "require": { "php": "7.4 - 8.3", "typo3/cms-core": "^11.5.40|^12.4.21", - "kitodo/presentation": "@dev" + "kitodo/presentation": "^5.0|dev-master|@dev" }, "autoload": { "psr-4": { From bffcbe676c7b8f2c3ca916ed2633d3a87505231a Mon Sep 17 00:00:00 2001 From: Markus Weigelt Date: Mon, 4 Nov 2024 14:46:08 +0100 Subject: [PATCH 7/7] Remove dev version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ae16724..6924114 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "require": { "php": "7.4 - 8.3", "typo3/cms-core": "^11.5.40|^12.4.21", - "kitodo/presentation": "^5.0|dev-master|@dev" + "kitodo/presentation": "^5.0|dev-master" }, "autoload": { "psr-4": {