diff --git a/changelog.d/anon-setting.fix b/changelog.d/anon-setting.fix new file mode 100644 index 000000000..ba741096b --- /dev/null +++ b/changelog.d/anon-setting.fix @@ -0,0 +1 @@ +fixed settings not appearing if user never touched "show advanced" toggle diff --git a/changelog.d/countdown.change b/changelog.d/countdown.change new file mode 100644 index 000000000..65ad68d50 --- /dev/null +++ b/changelog.d/countdown.change @@ -0,0 +1 @@ +temporary changes modal now shows actual countdown instead of fixed timeout diff --git a/changelog.d/disabled.change b/changelog.d/disabled.change new file mode 100644 index 000000000..6d7fa6d67 --- /dev/null +++ b/changelog.d/disabled.change @@ -0,0 +1 @@ +disabled elements are more disabled now diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js index cf68eaa14..b1b9bf7e7 100644 --- a/src/components/settings_modal/helpers/setting.js +++ b/src/components/settings_modal/helpers/setting.js @@ -271,7 +271,10 @@ export default { return this.realSource === 'admin' && this.$store.state.adminSettings.modifiedPaths?.has(this.canonPath.join(' -> ')) }, matchesExpertLevel () { - return (this.expert || 0) <= this.$store.state.config.expertLevel > 0 + const settingExpertLevel = this.expert || 0 + const userToggleExpert = this.$store.state.config.expertLevel || 0 + + return settingExpertLevel <= userToggleExpert } }, methods: { diff --git a/src/components/settings_modal/settings_modal_user_content.vue b/src/components/settings_modal/settings_modal_user_content.vue index 2bde5b21b..44460adfb 100644 --- a/src/components/settings_modal/settings_modal_user_content.vue +++ b/src/components/settings_modal/settings_modal_user_content.vue @@ -24,6 +24,7 @@