forked from deblan/side_menu
Merge pull request 'release of v3.7.2' (#238) from develop into master
Reviewed-on: deblan/side_menu#238
This commit is contained in:
commit
b133ba3a97
|
@ -6,7 +6,7 @@ pipeline:
|
||||||
- npm i
|
- npm i
|
||||||
when:
|
when:
|
||||||
event: [tag, push, pull_request]
|
event: [tag, push, pull_request]
|
||||||
branch: [master, develop, feature/*, translations]
|
branch: [master, develop, feature/*, fix/*, translations]
|
||||||
|
|
||||||
osv_detector:
|
osv_detector:
|
||||||
image: gitnet.fr/deblan/osv-detector:v0.10
|
image: gitnet.fr/deblan/osv-detector:v0.10
|
||||||
|
@ -19,7 +19,7 @@ pipeline:
|
||||||
commands:
|
commands:
|
||||||
- npm run build
|
- npm run build
|
||||||
when:
|
when:
|
||||||
branch: [master, develop, feature/*, translations]
|
branch: [master, develop, feature/*, fix/*, translations]
|
||||||
event: [tag, push, pull_request]
|
event: [tag, push, pull_request]
|
||||||
|
|
||||||
build_php:
|
build_php:
|
||||||
|
@ -27,7 +27,7 @@ pipeline:
|
||||||
commands:
|
commands:
|
||||||
- php bin/generate_l10n.php
|
- php bin/generate_l10n.php
|
||||||
when:
|
when:
|
||||||
branch: [master, develop, feature/*, translations]
|
branch: [master, develop, feature/*, fix/*, translations]
|
||||||
event: [tag, push, pull_request]
|
event: [tag, push, pull_request]
|
||||||
|
|
||||||
code_quality:
|
code_quality:
|
||||||
|
|
|
@ -1,5 +1,11 @@
|
||||||
## [Unreleased]
|
## [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
|
## 3.7.1
|
||||||
### Fixed
|
### Fixed
|
||||||
* fix build process (#230)
|
* fix build process (#230)
|
||||||
|
|
|
@ -32,7 +32,7 @@ Notice
|
||||||
Because I believe in a free and decentralized Internet, [Gitnet](https://gitnet.fr) is **self-hosted at home**.
|
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/).
|
In case of downtime, you can download **Custom Menu** from [here](https://kim.deblan.fr/~side_menu/).
|
||||||
]]></description>
|
]]></description>
|
||||||
<version>3.7.1</version>
|
<version>3.7.2</version>
|
||||||
<licence>agpl</licence>
|
<licence>agpl</licence>
|
||||||
<author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
|
<author mail="contact@deblan.fr" homepage="https://www.deblan.io/">Simon Vieille</author>
|
||||||
<namespace>SideMenu</namespace>
|
<namespace>SideMenu</namespace>
|
||||||
|
|
|
@ -93,7 +93,11 @@ export default {
|
||||||
|
|
||||||
for (let id in ncApps) {
|
for (let id in ncApps) {
|
||||||
if (window.topMenuApps.includes(id) && !window.topSideMenuApps.includes(id)) {
|
if (window.topMenuApps.includes(id) && !window.topSideMenuApps.includes(id)) {
|
||||||
continue;
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
if (this.hiddenApps.includes(id)) {
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
let app = ncApps[id]
|
let app = ncApps[id]
|
||||||
|
@ -104,10 +108,10 @@ export default {
|
||||||
|
|
||||||
finalApps.sort((a, b) => {
|
finalApps.sort((a, b) => {
|
||||||
if (a.order === null || b.order === null) {
|
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
|
this.apps = finalApps
|
||||||
|
@ -118,24 +122,23 @@ export default {
|
||||||
},
|
},
|
||||||
|
|
||||||
retrieveConfig() {
|
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() {
|
mounted() {
|
||||||
this.retrieveConfig()
|
axios
|
||||||
this.retrieveApps()
|
.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()
|
||||||
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
Loading…
Reference in a new issue