Merge branch 'feature/support-preload-settings' into 'develop'

Support preload settings

Closes #150

See merge request pleroma/admin-fe!162
This commit is contained in:
Angelina Filippova 2020-08-24 20:57:05 +00:00
commit 27be3dd0fc
2 changed files with 11 additions and 0 deletions

View file

@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Added
- Allow managing user's actor_type field via Admin API
- Add Pleroma.Web.Preload settings on Frontend tab
### Fixed

View file

@ -27,6 +27,10 @@
<el-form :model="markupData" :label-position="labelPosition" :label-width="labelWidth">
<setting :setting-group="markup" :data="markupData"/>
</el-form>
<el-divider v-if="preload" class="divider thick-line"/>
<el-form :model="preloadData" :label-position="labelPosition" :label-width="labelWidth">
<setting :setting-group="preload" :data="preloadData"/>
</el-form>
<div class="submit-button-container">
<el-button class="submit-button" type="primary" @click="onSubmit">Submit</el-button>
</div>
@ -106,6 +110,12 @@ export default {
markupData() {
return _.get(this.settings.settings, [':pleroma', ':markup']) || {}
},
preload() {
return this.settings.description.find(setting => setting.key === 'Pleroma.Web.Preload')
},
preloadData() {
return _.get(this.settings.settings, [':pleroma', 'Pleroma.Web.Preload']) || {}
},
staticFe() {
return this.settings.description.find(setting => setting.key === ':static_fe')
},