Merge branch 'feature/remove-settings-that-shouldnt-be-altered' into 'develop'
Remove settings that shouldn't be altered Closes #110 See merge request pleroma/admin-fe!131
This commit is contained in:
commit
dd4b5b2f21
5 changed files with 4 additions and 9 deletions
|
@ -11,6 +11,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
|||
- Statuses count changes when an instance is selected and shows the amount of statuses from an originating instance
|
||||
- Add a dialog window with a confirmation when a remove button is clicked on the Settings page
|
||||
- Disable tab on the Settings page if there are no settings on this tab that can be changed in Admin FE
|
||||
- Settings that can't be altered in Admin FE are removed: HTTP Signatures settings, Federation publisher modules and Oban Repo
|
||||
|
||||
### Fixed
|
||||
|
||||
|
|
|
@ -58,12 +58,6 @@ export default {
|
|||
httpSecurityData() {
|
||||
return _.get(this.settings.settings, [':pleroma', ':http_security']) || {}
|
||||
},
|
||||
httpSignatures() {
|
||||
return this.settings.description.find(setting => setting.group === ':http_signatures')
|
||||
},
|
||||
httpSignaturesData() {
|
||||
return _.get(this.settings.settings, [':http_signatures']) || {}
|
||||
},
|
||||
isMobile() {
|
||||
return this.$store.state.app.device === 'mobile'
|
||||
},
|
||||
|
|
|
@ -215,7 +215,7 @@ export default {
|
|||
return Array.isArray(this.data[':icons']) ? this.data[':icons'] : []
|
||||
},
|
||||
inputValue() {
|
||||
if ([':esshd', ':cors_plug', ':quack', ':http_signatures', ':tesla', ':swoosh'].includes(this.settingGroup.group) &&
|
||||
if ([':esshd', ':cors_plug', ':quack', ':tesla', ':swoosh'].includes(this.settingGroup.group) &&
|
||||
this.data[this.setting.key]) {
|
||||
return this.setting.type === 'atom' && this.data[this.setting.key].value[0] === ':'
|
||||
? this.data[this.setting.key].value.substr(1)
|
||||
|
|
|
@ -29,7 +29,7 @@ export const tabs = {
|
|||
},
|
||||
'http': {
|
||||
label: 'settings.http',
|
||||
settings: [':cors_plug', ':http', ':http_security', ':http_signatures', ':web_cache_ttl']
|
||||
settings: [':cors_plug', ':http', ':http_security', ':web_cache_ttl']
|
||||
},
|
||||
'instance': {
|
||||
label: 'settings.instance',
|
||||
|
|
|
@ -230,7 +230,7 @@ export default {
|
|||
},
|
||||
settingsCantBeChanged(settings) {
|
||||
const existingSettings = settings.filter(setting => {
|
||||
if ([':esshd', ':cors_plug', ':http_signatures', ':quack', ':logger', ':swoosh', ':mime'].includes(setting)) {
|
||||
if ([':esshd', ':cors_plug', ':quack', ':logger', ':swoosh', ':mime'].includes(setting)) {
|
||||
return this.$store.state.settings.description.findIndex(el => el.group === setting) !== -1
|
||||
} else if (setting === 'Pleroma.Web.Auth.Authenticator' || setting === ':admin_token') {
|
||||
return this.$store.state.settings.description.findIndex(el => el.children[0].key === setting) !== -1
|
||||
|
|
Loading…
Reference in a new issue