mirror of
https://github.com/sct/overseerr.git
synced 2025-09-17 17:24:35 +02:00
fix(requests): do not fail request edits if acting user lacks Manage Users permission (#2338)
* fix(api): fix requestedBy logic in request edits * fix(frontend): do not display empty advanced request options box * fix(frontend): set max height on modal backdrop
This commit is contained in:
@@ -549,11 +549,11 @@ requestRoutes.put<{ requestId: string }>(
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
let requestUser = req.user;
|
let requestUser = request.requestedBy;
|
||||||
|
|
||||||
if (
|
if (
|
||||||
req.body.userId &&
|
req.body.userId &&
|
||||||
req.body.userId !== req.user?.id &&
|
req.body.userId !== request.requestedBy.id &&
|
||||||
!req.user?.hasPermission([
|
!req.user?.hasPermission([
|
||||||
Permission.MANAGE_USERS,
|
Permission.MANAGE_USERS,
|
||||||
Permission.MANAGE_REQUESTS,
|
Permission.MANAGE_REQUESTS,
|
||||||
|
@@ -111,7 +111,7 @@ const Modal: React.FC<ModalProps> = ({
|
|||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{backdrop && (
|
{backdrop && (
|
||||||
<div className="absolute top-0 left-0 right-0 z-0 w-full h-64">
|
<div className="absolute top-0 left-0 right-0 z-0 w-full h-64 max-h-full">
|
||||||
<CachedImage
|
<CachedImage
|
||||||
alt=""
|
alt=""
|
||||||
src={backdrop}
|
src={backdrop}
|
||||||
|
@@ -267,7 +267,17 @@ const AdvancedRequester: React.FC<AdvancedRequesterProps> = ({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((!data || selectedServer === null) && !selectedUser) {
|
if (
|
||||||
|
(!data ||
|
||||||
|
selectedServer === null ||
|
||||||
|
(data.filter((server) => server.is4k === is4k).length < 2 &&
|
||||||
|
(!serverData ||
|
||||||
|
(serverData.profiles.length < 2 &&
|
||||||
|
serverData.rootFolders.length < 2 &&
|
||||||
|
(serverData.languageProfiles ?? []).length < 2 &&
|
||||||
|
!serverData.tags?.length)))) &&
|
||||||
|
(!selectedUser || (userData?.results ?? []).length < 2)
|
||||||
|
) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -503,7 +513,8 @@ const AdvancedRequester: React.FC<AdvancedRequesterProps> = ({
|
|||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
{hasPermission([Permission.MANAGE_REQUESTS, Permission.MANAGE_USERS]) &&
|
{hasPermission([Permission.MANAGE_REQUESTS, Permission.MANAGE_USERS]) &&
|
||||||
selectedUser && (
|
selectedUser &&
|
||||||
|
(userData?.results ?? []).length > 1 && (
|
||||||
<Listbox
|
<Listbox
|
||||||
as="div"
|
as="div"
|
||||||
value={selectedUser}
|
value={selectedUser}
|
||||||
|
Reference in New Issue
Block a user