Merge branch 'fix-settings-anon' into 'develop'
Fix Boolean/Choice settings not working properly on initial launch See merge request pleroma/pleroma-fe!1389
This commit is contained in:
commit
373b14e1e4
@ -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 {
|
|||||||
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: {
|
||||||
|
Loading…
Reference in New Issue
Block a user