usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix

This commit is contained in:
kakkokari-gtyih 2024-11-03 02:09:14 +09:00
parent 48e57989eb
commit b6ca1a5e90
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/frontend/src/pages/admin/client-setting-overrides.vue
View File

@ -45,7 +45,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<template #label>{{ i18n.ts.overrideValue }}</template> <template #label>{{ i18n.ts.overrideValue }}</template>
<template #caption>{{ i18n.ts.onToTrue }}</template> <template #caption>{{ i18n.ts.onToTrue }}</template>
</MkSwitch> </MkSwitch>
<MkTextarea v-else-if="def.formType === 'codeEditor'" v-model="def.overrideValue" :disabled="!def.enableOverride" pre> <MkTextarea v-else-if="def.formType === 'codeEditor'" v-model="def.overrideValue" :disabled="!def.enableOverride" pre code>
<template #label>{{ i18n.ts.overrideValue }}</template> <template #label>{{ i18n.ts.overrideValue }}</template>
</MkTextarea> </MkTextarea>
</div> </div>
@ -85,6 +85,7 @@ import { misskeyApi } from '@/scripts/misskey-api.js';
import { reloadAsk } from '@/scripts/reload-ask.js'; import { reloadAsk } from '@/scripts/reload-ask.js';
import MkSwitch from '@/components/MkSwitch.vue'; import MkSwitch from '@/components/MkSwitch.vue';
import MkTextarea from '@/components/MkTextarea.vue'; import MkTextarea from '@/components/MkTextarea.vue';
import JSON5 from 'json5';
const query = ref(''); const query = ref('');
@ -145,6 +146,7 @@ function typeSafeObjectEntries<T extends Record<string, any>>(obj: T) {
} }
function getClientSettingOverridesUIDefObj(def: unknown): ClientSettingOverridesUIDefObj { function getClientSettingOverridesUIDefObj(def: unknown): ClientSettingOverridesUIDefObj {
const _def = typeof def === 'object' ? JSON.stringify(def, null, '\t') : def;
return { return {
formType: (() => { formType: (() => {
if (typeof def === 'boolean') { if (typeof def === 'boolean') {
@ -159,7 +161,7 @@ function getClientSettingOverridesUIDefObj(def: unknown): ClientSettingOverrides
})() satisfies ClientSettingOverridesUIDefObj['formType'] as ClientSettingOverridesUIDefObj['formType'], })() satisfies ClientSettingOverridesUIDefObj['formType'] as ClientSettingOverridesUIDefObj['formType'],
enableOverride: false, enableOverride: false,
defaultValue: def, defaultValue: def,
overrideValue: def, overrideValue: _def,
}; };
} }
@ -205,7 +207,7 @@ async function save() {
(typeof def.defaultValue !== 'string' && typeof def.overrideValue === 'string' && def.overrideValue !== JSON.stringify(def.defaultValue)) (typeof def.defaultValue !== 'string' && typeof def.overrideValue === 'string' && def.overrideValue !== JSON.stringify(def.defaultValue))
) )
)) ))
.map(([key, def]) => [key, typeof def.overrideValue === 'string' && typeof def.defaultValue !== 'string' ? JSON.parse(def.overrideValue) : def.overrideValue]) .map(([key, def]) => [key, typeof def.overrideValue === 'string' && typeof def.defaultValue !== 'string' ? JSON5.parse(def.overrideValue) : def.overrideValue])
); );
let defaultClientSettingOverrides: string | null = JSON.stringify(overrides); let defaultClientSettingOverrides: string | null = JSON.stringify(overrides);