Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/photos.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/Controller/PageController.php7
-rw-r--r--src/Photos.vue1
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index e4fb631f..6a8baa96 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -33,6 +33,7 @@ use OCP\EventDispatcher\IEventDispatcher;
use OCP\IInitialStateService;
use OCP\IRequest;
use OCP\Util;
+use OCP\IConfig;
class PageController extends Controller {
@@ -47,12 +48,14 @@ class PageController extends Controller {
public function __construct($appName,
IRequest $request,
IEventDispatcher $eventDispatcher,
+ IConfig $config,
IInitialStateService $initialStateService) {
- parent::__construct($appName, $request);
+ parent::__construct($appName, $request, $config);
$this->appName = $appName;
$this->eventDispatcher = $eventDispatcher;
$this->initialStateService = $initialStateService;
+ $this->config = $config;
}
@@ -68,7 +71,7 @@ class PageController extends Controller {
$this->eventDispatcher->dispatch(LoadViewer::class, new LoadViewer());
$this->initialStateService->provideInitialState($this->appName, 'mimes', Application::MIMES);
- $this->initialStateService->provideInitialState($this->appName, 'maps', Application::MAPS);
+ $this->initialStateService->provideInitialState($this->appName, 'maps', $this->config->getAppValue('maps', 'enabled', 'no') === 'yes');
Util::addScript($this->appName, 'photos');
Util::addStyle($this->appName, 'icons');
diff --git a/src/Photos.vue b/src/Photos.vue
index bb477f00..8e1e0dd8 100644
--- a/src/Photos.vue
+++ b/src/Photos.vue
@@ -70,6 +70,7 @@ export default {
svgplaceholder,
imgplaceholder,
videoplaceholder,
+ MapsInstalled
}
},
}