This commit is contained in:
k
2026-09-22 09:35:29 +02:00
parent a57f5f0951
commit 2402e2e7fd
3 changed files with 49 additions and 15 deletions
+12 -1
View File
@@ -439,7 +439,18 @@ function EditUserDialog({ user, onClose, onSaved }: { user: User | null; onClose
e.preventDefault();
if (!user) return;
try {
await api.adminPatch(user.id, { username: username.trim().toLowerCase(), displayName: displayName.trim(), avatarUrl: avatarUrl.trim(), email: email.trim(), theme });
const patch: { username?: string; displayName?: string; avatarUrl?: string; theme?: string; email?: string } = {};
const normalizedUsername = username.trim().toLowerCase();
if (normalizedUsername !== (user.username ?? "").toLowerCase()) patch.username = normalizedUsername;
if (displayName.trim() !== (user.displayName ?? "")) patch.displayName = displayName.trim();
if (avatarUrl.trim() !== (user.avatarUrl ?? "")) patch.avatarUrl = avatarUrl.trim();
if (email.trim() !== (user.email ?? "")) patch.email = email.trim();
if (theme !== (user.theme ?? "auto")) patch.theme = theme;
if (Object.keys(patch).length === 0) {
onClose();
return;
}
await api.adminPatch(user.id, patch);
onSaved();
onClose();
} catch (err) {
+15 -1
View File
@@ -388,7 +388,21 @@ export function SettingsModal({
}
discardStaged();
}
const res = await api.updateMe({ username: username.trim().toLowerCase(), displayName: displayName.trim(), avatarUrl: url, email: email.trim(), theme });
const normalizedUsername = username.trim().toLowerCase();
// Only send fields that actually changed: this isolates a
// username error (e.g. admin rename guard) from the rest of the
// profile so one rejected field can't block the whole save.
const patch: { username?: string; displayName?: string; avatarUrl?: string; email?: string; theme?: string } = {};
if (normalizedUsername !== (user.username ?? "").toLowerCase()) patch.username = normalizedUsername;
if (displayName.trim() !== (user.displayName ?? "")) patch.displayName = displayName.trim();
if (url !== (user.avatarUrl ?? "")) patch.avatarUrl = url;
if (email.trim() !== (user.email ?? "")) patch.email = email.trim();
if (theme !== (user.theme ?? "auto")) patch.theme = theme;
if (Object.keys(patch).length === 0) {
onClose();
return;
}
const res = await api.updateMe(patch);
onSaved(res.user);
onClose();
} catch (err) {