diff options
| author | Henry Jameson <me@hjkos.com> | 2023-03-20 22:48:38 +0200 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2023-03-20 22:48:38 +0200 |
| commit | 819cd41cf0c4b2140470bba2a36eb15ed811c5b7 (patch) | |
| tree | 0608e5f10fa4028391e1100729e5fade4d3ba08c /src/components/settings_modal/helpers/setting.js | |
| parent | 332ad77e3579d2b512ba236b3f2c94ad8875864d (diff) | |
| parent | fa532b1f005220743d036b7d103c47a043be7ae4 (diff) | |
Merge remote-tracking branch 'origin/develop' into improve_settings_reusability
* origin/develop:
Translated using Weblate (Chinese (Simplified))
Generalize IntegerSetting into NumberSetting, add Integer/Float wrappers
Allow custom emoji reactions: add option to scale reaction buttons
Fix user-profile route crash on pinned favorites route
Hide custom emoji in reaction picker when BE does not advertise pleroma_custom_emoji_reactions
Allow custom emoji reactions
Diffstat (limited to 'src/components/settings_modal/helpers/setting.js')
| -rw-r--r-- | src/components/settings_modal/helpers/setting.js | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/components/settings_modal/helpers/setting.js b/src/components/settings_modal/helpers/setting.js index f270216f..8c7074a5 100644 --- a/src/components/settings_modal/helpers/setting.js +++ b/src/components/settings_modal/helpers/setting.js @@ -60,14 +60,13 @@ export default { } }, backendDescription () { - console.log(get(this.$store.state.adminSettings.descriptions, this.path)) return get(this.$store.state.adminSettings.descriptions, this.path) }, backendDescriptionLabel () { - return this.backendDescription.label + return this.backendDescription?.label }, backendDescriptionDescription () { - return this.backendDescription.description + return this.backendDescription?.description }, shouldBeDisabled () { const parentValue = this.parentPath !== undefined ? get(this.configSource, this.parentPath) : null |