Merge pull request #315 from beatrycze-volk/fix-typoscript

[MAINTENANCE] Replace `config.storagePid` with `storagePid` config from `tx_dlf` plugin
slub · Oct 15, 2024 · 788488f · 788488f
2 parents e3c9562 + 440bf52
commit 788488f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/Configuration/TypoScript/Plugins/dfgviewer.typoscript b/Configuration/TypoScript/Plugins/dfgviewer.typoscript
@@ -4,7 +4,7 @@
 
 plugin.tx_dfgviewer {
     persistence {
-        storagePid = {$config.storagePid}
+        storagePid = {$plugin.tx_dlf.persistence.storagePid}
     }
 	view {
 		partialRootPaths {

diff --git a/Configuration/TypoScript/Plugins/kitodo.typoscript b/Configuration/TypoScript/Plugins/kitodo.typoscript
@@ -24,10 +24,10 @@ plugin.tx_dlf._DEFAULT_PI_VARS.double.stdWrap.data = GP:set|double
 
 plugin.tx_dlf {
     persistence {
-        storagePid = {$config.storagePid}
+        storagePid = {$plugin.tx_dlf.persistence.storagePid}
     }
     settings {
-        storagePid = {$config.storagePid}
+        storagePid = {$plugin.tx_dlf.persistence.storagePid}
     }
 	view {
 		partialRootPaths {
@@ -138,7 +138,7 @@ lib.kitodo.navigation.pagecontrol {
 lib.kitodo.navigation.viewfunction < tt_content.list.20.dlf_navigation
 lib.kitodo.navigation.viewfunction {
     settings {
-        pages = {$config.kitodo.storagePid}
+        pages = {$plugin.tx_dlf.persistence.storagePid}
         features = pageselect,rotation,zoom
     }
 }
@@ -210,7 +210,7 @@ plugin.tx_dlf_audioplayer {
 # --------------------------------------------------------------------------------------------------------------------
 # 3d object
 # --------------------------------------------------------------------------------------------------------------------
-[getDocumentType({$config.storagePid}) == "object"]
+[getDocumentType({$plugin.tx_dlf.persistence.storagePid}) == "object"]
     page.10.variables {
         is3dObject = TEXT
         is3dObject.value = 1
@@ -220,21 +220,21 @@ plugin.tx_dlf_audioplayer {
 # --------------------------------------------------------------------------------------------------------------------
 # newspaper navigation
 # --------------------------------------------------------------------------------------------------------------------
-[getDocumentType({$config.storagePid}) == "ephemera" or getDocumentType({$config.storagePid}) == "newspaper"]
+[getDocumentType({$plugin.tx_dlf.persistence.storagePid}) == "ephemera" or getDocumentType({$plugin.tx_dlf.persistence.storagePid}) == "newspaper"]
 page.10.variables {
   isNewspaper = TEXT
   isNewspaper.value = newspaper_anchor
 }
 [END]
 
-[getDocumentType({$config.storagePid}) == "year"]
+[getDocumentType({$plugin.tx_dlf.persistence.storagePid}) == "year"]
 page.10.variables {
   isNewspaper = TEXT
   isNewspaper.value = newspaper_year
 }
 [END]
 
-[getDocumentType({$config.storagePid}) == "issue"]
+[getDocumentType({$plugin.tx_dlf.persistence.storagePid}) == "issue"]
 page.10.variables {
   isNewspaper = TEXT
   isNewspaper.value = newspaper_issue

diff --git a/Initialisation/data.xml b/Initialisation/data.xml
@@ -4194,7 +4194,6 @@
 				<field index="include_static_file">EXT:fluid_styled_content/Configuration/TypoScript/,EXT:dlf/Configuration/TypoScript/,EXT:dfgviewer/Configuration/TypoScript</field>
 				<field index="constants"># Please set at least the following constants via the TypoScript Constant Editor
 plugin.tx_dlf.persistence.storagePid = 3
-config.storagePid = 3
 config.rootPid = 1
 config.headNavPid = 0
 config.kitodoPageView = 2</field>