Skip to content

Commit 0795f87

Browse files
committed
Fix admins being unable to select permissions for subusers; closes pterodactyl#2055
1 parent 1f943d9 commit 0795f87

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

resources/scripts/components/server/users/EditSubuserModal.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ const EditSubuserModal = forwardRef<HTMLHeadingElement, Props>(({ subuser, ...pr
5353
const [ canEditUser ] = usePermissions(subuser ? [ 'user.update' ] : [ 'user.create' ]);
5454
const permissions = useStoreState(state => state.permissions.data);
5555

56+
const user = useStoreState(state => state.user.data!);
57+
5658
// The currently logged in user's permissions. We're going to filter out any permissions
5759
// that they should not need.
5860
const loggedInPermissions = ServerContext.useStoreState(state => state.server.permissions);
@@ -64,7 +66,7 @@ const EditSubuserModal = forwardRef<HTMLHeadingElement, Props>(({ subuser, ...pr
6466

6567
const list: string[] = ([] as string[]).concat.apply([], Object.values(cleaned));
6668

67-
if (loggedInPermissions.length === 1 && loggedInPermissions[0] === '*') {
69+
if (user.rootAdmin || (loggedInPermissions.length === 1 && loggedInPermissions[0] === '*')) {
6870
return list;
6971
}
7072

@@ -81,12 +83,14 @@ const EditSubuserModal = forwardRef<HTMLHeadingElement, Props>(({ subuser, ...pr
8183
}
8284
</h3>
8385
<FlashMessageRender byKey={'user:edit'} className={'mt-4'}/>
86+
{(!user.rootAdmin && loggedInPermissions[0] !== '*') &&
8487
<div className={'mt-4 pl-4 py-2 border-l-4 border-cyan-400'}>
8588
<p className={'text-sm text-neutral-300'}>
8689
Only permissions which your account is currently assigned may be selected when creating or
8790
modifying other users.
8891
</p>
8992
</div>
93+
}
9094
{!subuser &&
9195
<div className={'mt-6'}>
9296
<Field

0 commit comments

Comments
 (0)