diff --git a/.woodpecker.yml b/.woodpecker.yml index 59a771b..1c02aa5 100644 --- a/.woodpecker.yml +++ b/.woodpecker.yml @@ -6,7 +6,7 @@ pipeline: - npm i when: event: [tag, push, pull_request] - branch: [master, develop, feature/*, translations] + branch: [master, develop, feature/*, fix/*, translations] osv_detector: image: gitnet.fr/deblan/osv-detector:v0.10 @@ -19,7 +19,7 @@ pipeline: commands: - npm run build when: - branch: [master, develop, feature/*, translations] + branch: [master, develop, feature/*, fix/*, translations] event: [tag, push, pull_request] build_php: @@ -27,7 +27,7 @@ pipeline: commands: - php bin/generate_l10n.php when: - branch: [master, develop, feature/*, translations] + branch: [master, develop, feature/*, fix/*, translations] event: [tag, push, pull_request] code_quality: diff --git a/CHANGELOG.md b/CHANGELOG.md index 42089a2..6a44bf0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ ## [Unreleased] +## 3.7.2 +### Added +* update pipeline conditions allowing `fix/*` +### Fixed +* fix #233: load configuration and then retrieve apps in default side menu display + ## 3.7.1 ### Fixed * fix build process (#230) diff --git a/appinfo/info.xml b/appinfo/info.xml index d14d467..8614a98 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -32,7 +32,7 @@ Notice Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**. In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/). ]]> - 3.7.1 + 3.7.2 agpl Simon Vieille SideMenu diff --git a/src/SideMenu.vue b/src/SideMenu.vue index c785d46..fd2f24e 100644 --- a/src/SideMenu.vue +++ b/src/SideMenu.vue @@ -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,24 +122,23 @@ export default { }, retrieveConfig() { - axios - .get(OC.generateUrl('/apps/side_menu/js/config')) - .then((response) => { - const config = response.data - - this.targetBlankApps = config['target-blank-apps'] - this.forceLightIcon = config['force-light-icon'] - this.avatar = config['avatar'] - this.logo = config['logo'] - this.logoLink = config['logo-link'] - this.settings = config['settings'] - this.hiddenApps = config['big-menu-hidden-apps'] - }) }, }, mounted() { - this.retrieveConfig() - this.retrieveApps() + axios + .get(OC.generateUrl('/apps/side_menu/js/config')) + .then((response) => { + const config = response.data + + this.targetBlankApps = config['target-blank-apps'] + this.forceLightIcon = config['force-light-icon'] + this.avatar = config['avatar'] + this.logo = config['logo'] + this.logoLink = config['logo-link'] + this.settings = config['settings'] + this.hiddenApps = config['big-menu-hidden-apps'] + this.retrieveApps() + }) } }