fix issue with top and side apps (#162 #159)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
This commit is contained in:
parent
712777470c
commit
1d06c1b212
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue