refactoring

This commit is contained in:
Simon Vieille 2020-08-12 16:27:43 +02:00
parent deca4b2cba
commit 3f2a307226
Signed by: deblan
GPG key ID: 03383D15A1D31745
2 changed files with 17 additions and 12 deletions

View file

@ -124,6 +124,11 @@ class NavController extends Controller
$categoriesLabels['external_links'] = $this->trans->t('External sites');
$items['other'] = [
'name' => '',
'apps' => [],
];
foreach ($apps as $app) {
if (in_array($app['id'], $topMenuApps)) {
continue;
@ -132,8 +137,11 @@ class NavController extends Controller
$categories = (array) $app['category'];
$appsCategories[$app['id']] = [];
foreach ($categories as $category) {
if (empty($categories)) {
$categories = ['other'];
}
foreach ($categories as $category) {
if (!isset($items[$category])) {
$items[$category] = [
'name' => $categoriesLabels[$category],
@ -185,17 +193,6 @@ class NavController extends Controller
}
}
$items['other'] = [
'name' => '',
'apps' => [
'files' => [
'name' => 'Files',
'href' => $this->router->linkTo('files', ''),
'icon' => '/apps/files/img/app.svg',
]
],
];
foreach ($items as $category => $value) {
ksort($items[$category]['apps']);
}

View file

@ -54,6 +54,14 @@ class AppRepository
'external_links',
],
];
} elseif ($app['id'] === 'files') {
$visibleApps[$app['id']] = [
'id' => $app['id'],
'name' => $app['name'],
'preview' => $app['icon'],
'previewAsIcon' => true,
'category' => [],
];
}
}