Merge branch 'feature/issue162' into develop
This commit is contained in:
commit
0ea7fe04bf
|
@ -113,11 +113,11 @@ class NavController extends Controller
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($apps as $app) {
|
foreach ($apps as $app) {
|
||||||
if (in_array($app['id'], $topMenuApps) && !in_array($app['id'], $userTopSideMenuApps)) {
|
$inTopMenuApps = in_array($app['id'], $topMenuApps);
|
||||||
continue;
|
$inTopSideMenuApps = in_array($app['id'], $topSideMenuApps);
|
||||||
}
|
$inHiddenApps = in_array($app['id'], $hiddenApps);
|
||||||
|
|
||||||
if (in_array($app['id'], $hiddenApps)) {
|
if (($inTopMenuApps && !$inTopSideMenuApps) || $inHiddenApps) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue