hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fix-1385' into 'develop'

Browse source 
Fix #1385

Closes #1385

See merge request pleroma/pleroma-fe!2188
This commit is contained in:
HJ 2025-12-19 17:34:25 +00:00
commit 657de70153
5 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/anon-setting.fix Normal file
View file

@ -0,0 +1 @@
fixed settings not appearing if user never touched "show advanced" toggle

1
changelog.d/countdown.change Normal file
View file

@ -0,0 +1 @@
temporary changes modal now shows actual countdown instead of fixed timeout

1
changelog.d/disabled.change Normal file
View file

@ -0,0 +1 @@
disabled elements are more disabled now

5
src/components/settings_modal/helpers/setting.js
View file

@ -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: {

1
src/components/settings_modal/settings_modal_user_content.vue
View file

@ -24,6 +24,7 @@
<ProfileTab />
</div>
<div
v-if="isLoggedIn"
:label="$t('settings.composing')"
icon="pen-alt"
data-tab-name="composing"