deblan/side_menu
deblan/side_menu
4
11
Fork 9
Code Issues 20 Pull requests 3 Projects Releases 137 Wiki Activity

Merge pull request 'fix #369: The menu is displayed even if there are no apps' (#370) from bugfix/issue369 into develop
Some checks are pending
ci/woodpecker/push/build Pipeline is pending approval
Details
ci/woodpecker/push/security Pipeline is pending approval
Details

Browse source 
Reviewed-on: #370
This commit is contained in:
Simon Vieille 2024-10-30 19:00:43 +01:00
commit 8c9dc83a59
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/SideMenu.vue
View file

@ -39,7 +39,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<ul class="side-menu-apps-list" :class="{'side-menu-apps-list--with-settings': !!settings}">
<SideMenuApp
v-for="(app, key) in apps"
v-if="!hiddenApps.includes(app.id) && searchMatch(app.name)"
v-if="searchMatch(app.name)"
v-bind:classes="{'side-menu-app': true, 'active': app.active}"
v-bind:key="key"
v-bind:icon="app.icon"
@ -94,17 +94,16 @@ export default {
orders[app] = order + 1
})
for (let id in ncApps) {
if (window.topMenuApps.includes(id) && !window.topSideMenuApps.includes(id)) {
for (let app of ncApps) {
if (window.topMenuApps.includes(app.id) && !window.topSideMenuApps.includes(app.id)) {
continue
}
if (this.hiddenApps.includes(id)) {
if (this.hiddenApps.includes(app.id)) {
continue
}
let app = ncApps[id]
app.order = orders[id] || null
app.order = orders[app.id] || null
finalApps.push(app)
}