fix issue with 'top-menu-apps'

This commit is contained in:
Simon Vieille 2020-08-12 16:16:50 +02:00
parent a1b1396b63
commit deca4b2cba
Signed by: deblan
GPG key ID: 03383D15A1D31745
2 changed files with 15 additions and 1 deletions

View file

@ -23,6 +23,8 @@ use OCP\AppFramework\Http\TemplateResponse;
use OCP\AppFramework\Http\Response;
use OCP\IConfig;
use OCP\IRequest;
use OC;
use OCP\IUserSession;
class CssController extends Controller
{
@ -55,6 +57,17 @@ class CssController extends Controller
$backgroundColor = $this->config->getAppValue('side_menu', 'background-color', '#333333');
$backgroundColorTo = $this->config->getAppValue('side_menu', 'background-color-to', $backgroundColor);
$user = OC::$server[IUserSession::class]->getUser();
$topMenuApps = (array) json_decode($this->config->getAppValue('side_menu', 'top-menu-apps', '[]'), true);
if ($user) {
$userTopMenuApps = (array) json_decode($this->config->getUserValue($user->getUid(), 'side_menu', 'top-menu-apps', '[]'), true);
if (!empty($userTopMenuApps)) {
$topMenuApps = $userTopMenuApps;
}
}
$parameters = [
'vars' => [
'background-color' => $backgroundColor,
@ -70,6 +83,7 @@ class CssController extends Controller
'size-icon' => $this->config->getAppValue('side_menu', 'size-icon', 'normal'),
'size-text' => $this->config->getAppValue('side_menu', 'size-text', 'normal'),
'big-menu' => (bool) $this->config->getAppValue('side_menu', 'big-menu', '0'),
'top-menu-apps' => $topMenuApps,
];
$response = new TemplateResponse('side_menu', 'css/stylesheet', $parameters, 'blank');

View file

@ -8,7 +8,7 @@
<?php endforeach; ?>
}
<?php if ($_['external-sites-in-top-menu'] === false): ?>
<?php if (empty($_['top-menu-apps'])): ?>
#appmenu {
display: none;
}