Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

バックアップ名が null のバックアップが作成でき削除などの操作ができなくなる問題を修正 (MisskeyIO#474)

Browse source
This commit is contained in:
riku6460 2024-02-25 03:38:19 +09:00 committed by GitHub
parent c795ec2111
commit dbcf85e620
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/frontend/src/os.ts
View file

@ -289,7 +289,7 @@ export function inputText(props: {
}, },
}, { }, {
done: result => { done: result => {
resolve(result ? result : { canceled: true }); resolve(typeof result.result === 'string' ? result : { canceled: true, result: undefined });
}, },
}, 'closed'); }, 'closed');
}); });

8
packages/frontend/src/pages/settings/preferences-backups.vue
View file

@ -278,7 +278,7 @@ async function applyProfile(id: string): Promise<void> {
const { canceled: cancel1 } = await os.confirm({ const { canceled: cancel1 } = await os.confirm({
type: 'warning', type: 'warning',
title: ts._preferencesBackups.apply, title: ts._preferencesBackups.apply,
text: t('_preferencesBackups.applyConfirm', { name: profile.name }), text: t('_preferencesBackups.applyConfirm', { name: profile.name || '' }),
}); });
if (cancel1) return; if (cancel1) return;
@ -336,7 +336,7 @@ async function deleteProfile(id: string): Promise<void> {
const { canceled } = await os.confirm({ const { canceled } = await os.confirm({
type: 'info', type: 'info',
title: ts.delete, title: ts.delete,
text: t('deleteAreYouSure', { x: profiles.value[id].name }), text: t('deleteAreYouSure', { x: profiles.value[id].name || '' }),
}); });
if (canceled) return; if (canceled) return;
@ -352,7 +352,7 @@ async function save(id: string): Promise<void> {
const { canceled } = await os.confirm({ const { canceled } = await os.confirm({
type: 'info', type: 'info',
title: ts._preferencesBackups.save, title: ts._preferencesBackups.save,
text: t('_preferencesBackups.saveConfirm', { name }), text: t('_preferencesBackups.saveConfirm', { name: name || '' }),
}); });
if (canceled) return; if (canceled) return;
@ -387,7 +387,7 @@ async function rename(id: string): Promise<void> {
const { canceled: cancel2 } = await os.confirm({ const { canceled: cancel2 } = await os.confirm({
type: 'info', type: 'info',
title: ts.rename, title: ts.rename,
text: t('_preferencesBackups.renameConfirm', { old: registry.name, new: name }), text: t('_preferencesBackups.renameConfirm', { old: registry.name || '', new: name }),
}); });
if (cancel2) return; if (cancel2) return;