fix: allow profile picture update even if "allow own account edit" enabled

This commit is contained in:
Elias Schneider
2025-07-03 10:57:56 +02:00
parent be52660227
commit 9872608d61
3 changed files with 63 additions and 45 deletions

View File

@@ -34,6 +34,10 @@
const userService = new UserService();
const webauthnService = new WebAuthnService();
const userInfoInputDisabled = $derived(
!$appConfigStore.allowOwnAccountEdit || (!!account.ldapId && $appConfigStore.ldapEnabled)
);
async function updateAccount(user: UserCreate) {
let success = true;
await userService
@@ -118,27 +122,23 @@
</div>
<!-- Account details card -->
<fieldset
disabled={!$appConfigStore.allowOwnAccountEdit ||
(!!account.ldapId && $appConfigStore.ldapEnabled)}
>
<Card.Root>
<Card.Header>
<Card.Title>
<UserCog class="text-primary/80 size-5" />
{m.account_details()}
</Card.Title>
</Card.Header>
<Card.Content>
<AccountForm
{account}
userId={account.id}
callback={updateAccount}
isLdapUser={!!account.ldapId}
/>
</Card.Content>
</Card.Root>
</fieldset>
<Card.Root>
<Card.Header>
<Card.Title>
<UserCog class="text-primary/80 size-5" />
{m.account_details()}
</Card.Title>
</Card.Header>
<Card.Content>
<AccountForm
{account}
userId={account.id}
callback={updateAccount}
isLdapUser={!!account.ldapId}
{userInfoInputDisabled}
/>
</Card.Content>
</Card.Root>
<!-- Passkey management card -->
<div>

View File

@@ -15,12 +15,14 @@
callback,
account,
userId,
isLdapUser = false
isLdapUser = false,
userInfoInputDisabled = false
}: {
account: UserCreate;
userId: string;
callback: (user: UserCreate) => Promise<boolean>;
isLdapUser?: boolean;
userInfoInputDisabled?: boolean;
} = $props();
let isLoading = $state(false);
@@ -78,26 +80,28 @@
<hr class="border-border" />
<!-- User Information -->
<div>
<div class="flex flex-col gap-3 sm:flex-row">
<div class="w-full">
<FormInput label={m.first_name()} bind:input={$inputs.firstName} />
<fieldset disabled={userInfoInputDisabled}>
<div>
<div class="flex flex-col gap-3 sm:flex-row">
<div class="w-full">
<FormInput label={m.first_name()} bind:input={$inputs.firstName} />
</div>
<div class="w-full">
<FormInput label={m.last_name()} bind:input={$inputs.lastName} />
</div>
</div>
<div class="w-full">
<FormInput label={m.last_name()} bind:input={$inputs.lastName} />
<div class="mt-3 flex flex-col gap-3 sm:flex-row">
<div class="w-full">
<FormInput label={m.email()} bind:input={$inputs.email} />
</div>
<div class="w-full">
<FormInput label={m.username()} bind:input={$inputs.username} />
</div>
</div>
</div>
<div class="mt-3 flex flex-col gap-3 sm:flex-row">
<div class="w-full">
<FormInput label={m.email()} bind:input={$inputs.email} />
</div>
<div class="w-full">
<FormInput label={m.username()} bind:input={$inputs.username} />
</div>
</div>
</div>
<div class="flex justify-end pt-2">
<Button {isLoading} type="submit">{m.save()}</Button>
</div>
<div class="flex justify-end pt-2">
<Button {isLoading} type="submit">{m.save()}</Button>
</div>
</fieldset>
</form>