deblan/side_menu
deblan/side_menu
3
6
Fork 5
Code Issues 7 Pull requests 11 Projects Releases 119 Wiki Activity

release v3.3.0 #167

Merged
deblan merged 11 commits from develop into master 2022-11-04 22:43:18 +01:00
Conversation 0 Commits 11 Files changed 19 +7 -1
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 1d06c1b212 - Show all commits

8
lib/Controller/NavController.php
View file

@ -98,6 +98,8 @@ class NavController extends Controller
$hiddenApps = $this->config->getAppValueArray('big-menu-hidden-apps', '[]'); $hiddenApps = $this->config->getAppValueArray('big-menu-hidden-apps', '[]');
$isForced = $this->config->getAppValueBool('force', '0'); $isForced = $this->config->getAppValueBool('force', '0');
$topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]'); $topMenuApps = $this->config->getAppValueArray('top-menu-apps', '[]');
$topSideMenuApps = $this->config->getAppValueArray('top-side-menu-apps', '[]');
$userTopSideMenuApps = $this->config->getUserValueArray($user, 'top-side-menu-apps', '[]');
$userTopMenuApps = $this->config->getUserValueArray($user, 'top-menu-apps', '[]'); $userTopMenuApps = $this->config->getUserValueArray($user, 'top-menu-apps', '[]');
$appsCategories = []; $appsCategories = [];
$categoriesAppsCount = []; $categoriesAppsCount = [];
@ -106,8 +108,12 @@ class NavController extends Controller
$topMenuApps = $userTopMenuApps; $topMenuApps = $userTopMenuApps;
} }
if (!$isForced && !empty($userTopSideMenuApps)) {
$topSideMenuApps = $userTopSideMenuApps;
}
foreach ($apps as $app) { foreach ($apps as $app) {
if (in_array($app['id'], $topMenuApps)) { if (in_array($app['id'], $topMenuApps) && !in_array($app['id'], $userTopSideMenuApps)) {
continue; continue;
} }