renamed EDIT_PASSWORD to ADMIN
This commit is contained in:
parent
b1787cda4e
commit
8620e9b0cd
|
|
@ -18,7 +18,7 @@
|
|||
"position": 3,
|
||||
"name": "Bearbeiten"
|
||||
},
|
||||
"EDIT_PASSWORD": {
|
||||
"ADMIN": {
|
||||
"position": 4,
|
||||
"name": "Administration"
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,6 +20,12 @@ interface GroupDef {
|
|||
|
||||
type PermissionDef = Record<string, GroupDef>
|
||||
|
||||
interface PermissionDescription {
|
||||
key: string
|
||||
value: number
|
||||
name: string
|
||||
}
|
||||
|
||||
|
||||
const _display_names = new Map<number, string>()
|
||||
|
||||
|
|
@ -138,7 +144,7 @@ export default {
|
|||
has: (user_permissions: number, permissions: number): boolean => (user_permissions & permissions) == permissions,
|
||||
any: (user_permissions: number, permissions: number): boolean => (user_permissions & permissions) > 0,
|
||||
|
||||
iterate: (permission_group: Record<string, number>): Array<{key: string, value: number, name: string}> => Object.entries(permission_group).map(([key, value]) => ({ key: key, value: value, name: _to_display_name(value)})),
|
||||
iterate: (permission_group: Record<string, number>): Array<PermissionDescription> => Object.entries(permission_group).map(([key, value]) => ({ key: key, value: value, name: _to_display_name(value)})),
|
||||
is_meta: (permission: number) => permission != 0 && ((permission & (permission - 1)) != 0),
|
||||
|
||||
deconstruct: _deconstruct,
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ export const load: PageServerLoad = ({ locals, url }) => {
|
|||
return fail(404, { message: `User ${user_id} not found` })
|
||||
}
|
||||
|
||||
if (!Permissions.has(locals.user.permissions, Permissions.USERADMIN.EDIT_PASSWORD)) {
|
||||
if (!Permissions.has(locals.user.permissions, Permissions.USERADMIN.ADMIN)) {
|
||||
user.permissions = 0
|
||||
}
|
||||
}
|
||||
|
|
@ -75,7 +75,7 @@ export const actions = {
|
|||
|
||||
if (locals.user.id != id
|
||||
&& (!Permissions.has(locals.user.permissions, Permissions.USERADMIN.EDIT)
|
||||
|| ((password1 != null || password2 != null) && !Permissions.has(locals.user.permissions, Permissions.USERADMIN.EDIT_PASSWORD)))) {
|
||||
|| ((password1 != null || password2 != null) && !Permissions.has(locals.user.permissions, Permissions.USERADMIN.ADMIN)))) {
|
||||
return fail(403, { message: "Unauthorized action" })
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@
|
|||
</tbody>
|
||||
</table>
|
||||
|
||||
{#if data.user?.id == data.loggedInAs.id || Permissions.has(data.loggedInAs.permissions ?? 0, Permissions.USERADMIN.EDIT_PASSWORD)}
|
||||
{#if data.user?.id == data.loggedInAs.id || Permissions.has(data.loggedInAs.permissions ?? 0, Permissions.USERADMIN.ADMIN)}
|
||||
{@const disabled = data.user?.id == data.loggedInAs.id}
|
||||
<table>
|
||||
<colgroup>
|
||||
|
|
|
|||
Loading…
Reference in New Issue