vitormattos/side_menu
1
0
Fork 0
forked from deblan/side_menu
Code Pull requests Activity

rename 'top-menu-apps-order' with 'apps-order'

Browse source
This commit is contained in:
Simon Vieille 2022-10-27 21:51:58 +02:00
commit 07c7221ca2
Signed by untrusted user: deblan
GPG key ID: 579388D585F70417
6 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/Controller/JsController.php
View file

@ -162,10 +162,10 @@ class JsController extends Controller
'side-with-categories' => $this->config->getAppValueBool('side-with-categories', '0'),
'big-menu' => $this->config->getAppValueBool('big-menu', '0'),
'big-menu-hidden-apps' => $this->config->getAppValueArray('big-menu-hidden-apps', '[]'),
'apps-order' => $this->config->getAppValueArray('apps-order', '[]'),
'avatar' => $avatar,
'top-menu-apps' => $topMenuApps,
'top-side-menu-apps' => $topSideMenuApps,
'top-menu-apps-order' => $topMenuAppsOrder,
'target-blank-apps' => $targetBlankApps,
'settings' => $settings,
'logo' => $this->themingDefaults->getLogo(),

8
lib/Service/AppRepository.php
View file

@ -98,10 +98,6 @@ class AppRepository
}
}
usort($visibleApps, function ($a, $b) {
return ($a['name'] < $b['name']) ? -1 : 1;
});
return $visibleApps;
}
@ -114,10 +110,10 @@ class AppRepository
);
}
public function getTopMenuOrderedApps()
public function getOrderedApps()
{
$apps = $this->getVisibleApps();
$orders = $this->config->getAppValueArray('top-menu-apps-order', '[]');
$orders = $this->config->getAppValueArray('apps-order', '[]');
usort($apps, function ($a, $b) use ($orders) {
$ak = array_keys($orders, $a['id'])[0] ?? null;