Merge pull request #50540 from nextcloud/fix/show-templates-folder-default

juliusknorr · web-flow · commit 8604389ebe97 · 2025-01-30T11:21:56.000+01:00
fix: Only hide template folder creation if default was changed to empty
diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php
@@ -194,7 +194,7 @@ public function index($dir = '', $view = '', $fileid = null, $fileNotFound = fal
 			$this->eventDispatcher->dispatchTyped(new LoadViewer());
 		}
 
-		$this->initialState->provideInitialState('templates_enabled', ($this->config->getSystemValueString('skeletondirectory', '') !== '') || ($this->config->getSystemValueString('templatedirectory', '') !== ''));
+		$this->initialState->provideInitialState('templates_enabled', ($this->config->getSystemValueString('skeletondirectory', \OC::$SERVERROOT . '/core/skeleton') !== '') || ($this->config->getSystemValueString('templatedirectory', \OC::$SERVERROOT . '/core/skeleton/Templates') !== ''));
 		$this->initialState->provideInitialState('templates_path', $this->templateManager->hasTemplateDirectory() ? $this->templateManager->getTemplatePath() : false);
 		$this->initialState->provideInitialState('templates', $this->templateManager->listCreators());
 

Original file line number	Diff line number	Diff line change
`@@ -194,7 +194,7 @@ public function index($dir = '', $view = '', $fileid = null, $fileNotFound = fal`
`194`	`194`	`$this->eventDispatcher->dispatchTyped(new LoadViewer());`
`195`	`195`	`}`
`196`	`196`
`197`		`- $this->initialState->provideInitialState('templates_enabled', ($this->config->getSystemValueString('skeletondirectory', '') !== '') \|\| ($this->config->getSystemValueString('templatedirectory', '') !== ''));`
	`197`	`+ $this->initialState->provideInitialState('templates_enabled', ($this->config->getSystemValueString('skeletondirectory', \OC::$SERVERROOT . '/core/skeleton') !== '') \|\| ($this->config->getSystemValueString('templatedirectory', \OC::$SERVERROOT . '/core/skeleton/Templates') !== ''));`
`198`	`198`	`$this->initialState->provideInitialState('templates_path', $this->templateManager->hasTemplateDirectory() ? $this->templateManager->getTemplatePath() : false);`
`199`	`199`	`$this->initialState->provideInitialState('templates', $this->templateManager->listCreators());`
`200`	`200`