Merge pull request 'load configuration and then retrieve apps in default side menu display' (#235) from feature/issue233 into develop
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Reviewed-on: #235
This commit is contained in:
commit
396d3cfbc5
|
@ -93,7 +93,11 @@ export default {
|
|||
|
||||
for (let id in ncApps) {
|
||||
if (window.topMenuApps.includes(id) && !window.topSideMenuApps.includes(id)) {
|
||||
continue;
|
||||
continue
|
||||
}
|
||||
|
||||
if (this.hiddenApps.includes(id)) {
|
||||
continue
|
||||
}
|
||||
|
||||
let app = ncApps[id]
|
||||
|
@ -104,10 +108,10 @@ export default {
|
|||
|
||||
finalApps.sort((a, b) => {
|
||||
if (a.order === null || b.order === null) {
|
||||
return a.name < b.name ? -1 : 1;
|
||||
return a.name < b.name ? -1 : 1
|
||||
}
|
||||
|
||||
return a.order < b.order ? -1 : 1;
|
||||
return a.order < b.order ? -1 : 1
|
||||
})
|
||||
|
||||
this.apps = finalApps
|
||||
|
@ -118,6 +122,9 @@ export default {
|
|||
},
|
||||
|
||||
retrieveConfig() {
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
axios
|
||||
.get(OC.generateUrl('/apps/side_menu/js/config'))
|
||||
.then((response) => {
|
||||
|
@ -130,12 +137,8 @@ export default {
|
|||
this.logoLink = config['logo-link']
|
||||
this.settings = config['settings']
|
||||
this.hiddenApps = config['big-menu-hidden-apps']
|
||||
})
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
this.retrieveConfig()
|
||||
this.retrieveApps()
|
||||
})
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
|
Loading…
Reference in a new issue