Skip to content
Snippets Groups Projects
Commit 373b14e1 authored by Shpuld Shpludson's avatar Shpuld Shpludson
Browse files

Merge branch 'fix-settings-anon' into 'develop'

Fix Boolean/Choice settings not working properly on initial launch

See merge request pleroma/pleroma-fe!1389
parents 19475ba3 32d1a0e1
No related branches found
No related tags found
No related merge requests found
...@@ -16,10 +16,18 @@ export default { ...@@ -16,10 +16,18 @@ export default {
return [firstSegment + 'DefaultValue', ...rest].join('.') return [firstSegment + 'DefaultValue', ...rest].join('.')
}, },
state () { state () {
return get(this.$parent, this.path) const value = get(this.$parent, this.path)
if (value === undefined) {
return this.defaultState
} else {
return value
}
},
defaultState () {
return get(this.$parent, this.pathDefault)
}, },
isChanged () { isChanged () {
return get(this.$parent, this.path) !== get(this.$parent, this.pathDefault) return this.state !== this.defaultState
} }
}, },
methods: { methods: {
......
...@@ -17,13 +17,18 @@ export default { ...@@ -17,13 +17,18 @@ export default {
return [firstSegment + 'DefaultValue', ...rest].join('.') return [firstSegment + 'DefaultValue', ...rest].join('.')
}, },
state () { state () {
return get(this.$parent, this.path) const value = get(this.$parent, this.path)
if (value === undefined) {
return this.defaultState
} else {
return value
}
}, },
defaultState () { defaultState () {
return get(this.$parent, this.pathDefault) return get(this.$parent, this.pathDefault)
}, },
isChanged () { isChanged () {
return get(this.$parent, this.path) !== get(this.$parent, this.pathDefault) return this.state !== this.defaultState
} }
}, },
methods: { methods: {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment