Fix option to change role to user for super admins (#4818)

* Fix option to change role to user for super admins * Clean up permission check
canada-ca · Sep 26, 2023 · c15b1d1 · c15b1d1
1 parent e7ff471
commit c15b1d1
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/frontend/src/admin/UserListModal.js b/frontend/src/admin/UserListModal.js
@@ -254,9 +254,8 @@ export function UserListModal({
                     >
                       {editingUserRole === 'PENDING' && <option value="PENDING">{t`PENDING`}</option>}
                       {(['PENDING', 'USER'].includes(editingUserRole) ||
-                        (['ADMIN', 'OWNER', 'SUPER_ADMIN'].includes(permission) && editingUserRole === 'ADMIN')) && (
-                        <option value="USER">{t`USER`}</option>
-                      )}
+                        (['ADMIN', 'OWNER'].includes(permission) && editingUserRole === 'ADMIN') ||
+                        permission === 'SUPER_ADMIN') && <option value="USER">{t`USER`}</option>}
                       {(['PENDING', 'USER', 'ADMIN'].includes(editingUserRole) ||
                         (['SUPER_ADMIN'].includes(permission) && editingUserRole === 'OWNER')) && (
                         <option value="ADMIN">{t`ADMIN`}</option>