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

fix #24: missing apps

Browse source
This commit is contained in:
Simon Vieille 2020-08-19 09:18:29 +02:00
parent e7d319bbf7
commit e4f9765247
Signed by: deblan
GPG key ID: 03383D15A1D31745
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Controller/NavController.php
View file

@ -154,7 +154,7 @@ class NavController extends Controller
$items[$category]['apps'][$app['id']] = [ $items[$category]['apps'][$app['id']] = [
'name' => $app['name'], 'name' => $app['name'],
'href' => $app['href'], 'href' => $app['href'],
'icon' => $app['previewAsIcon'] ? $app['preview'] : null, 'icon' => $app['icon'],
]; ];
} }
} }

17
lib/Service/AppRepository.php
View file

@ -42,11 +42,14 @@ class AppRepository
foreach ($apps as $app) { foreach ($apps as $app) {
$id = $app['id']; $id = $app['id'];
if (isset($navigation[$id])) { foreach ([$app['id'], $app['id'].'_index'] as $id) {
$app['name'] = $this->l10nFactory->get($app['id'])->t($app['name']); if (isset($navigation[$id])) {
$app['href'] = $navigation[$id]['href']; $app['name'] = $this->l10nFactory->get($id)->t($app['name']);
$app['href'] = $navigation[$id]['href'];
$app['icon'] = $navigation[$id]['icon'];
$visibleApps[$id] = $app; $visibleApps[$id] = $app;
}
} }
} }
@ -56,8 +59,7 @@ class AppRepository
'id' => $app['id'], 'id' => $app['id'],
'name' => $this->l10nFactory->get($app['id'])->t($app['name']), 'name' => $this->l10nFactory->get($app['id'])->t($app['name']),
'href' => $app['href'], 'href' => $app['href'],
'preview' => $app['icon'], 'icon' => $app['icon'],
'previewAsIcon' => true,
'category' => [ 'category' => [
'external_links', 'external_links',
], ],
@ -67,8 +69,7 @@ class AppRepository
'id' => $app['id'], 'id' => $app['id'],
'name' => $this->l10nFactory->get($app['id'])->t($app['name']), 'name' => $this->l10nFactory->get($app['id'])->t($app['name']),
'href' => $app['href'], 'href' => $app['href'],
'preview' => $app['icon'], 'icon' => $app['icon'],
'previewAsIcon' => true,
'category' => [], 'category' => [],
]; ];
} }