Skip to content

Commit

Permalink
fix(frontend): show auto approval on series request modal only with c…
Browse files Browse the repository at this point in the history
…orrect permissions

fixes #687
  • Loading branch information
sct committed Jan 19, 2021
1 parent 81a96db commit 8927c6d
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
3 changes: 2 additions & 1 deletion src/components/RequestModal/MovieRequestModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ const messages = defineMessages({
request4kfrom: 'There is currently a pending 4K request from {username}',
errorediting: 'Something went wrong editing the request.',
requestedited: 'Request edited.',
autoapproval: 'Auto Approval',
});

interface RequestModalProps extends React.HTMLAttributes<HTMLDivElement> {
Expand Down Expand Up @@ -259,7 +260,7 @@ const MovieRequestModal: React.FC<RequestModalProps> = ({
hasPermission(Permission.AUTO_APPROVE) ||
hasPermission(Permission.AUTO_APPROVE_MOVIE)) && (
<p className="mt-6">
<Alert title="Auto Approval" type="info">
<Alert title={intl.formatMessage(messages.autoapproval)} type="info">
{intl.formatMessage(messages.requestadmin)}
</Alert>
</p>
Expand Down
8 changes: 6 additions & 2 deletions src/components/RequestModal/TvRequestModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ const messages = defineMessages({
errorediting: 'Something went wrong editing the request.',
requestedited: 'Request edited.',
requestcancelled: 'Request cancelled.',
autoapproval: 'Auto Approval',
});

interface RequestModalProps extends React.HTMLAttributes<HTMLDivElement> {
Expand Down Expand Up @@ -313,10 +314,13 @@ const TvRequestModal: React.FC<RequestModalProps> = ({
>
{(hasPermission(Permission.MANAGE_REQUESTS) ||
hasPermission(Permission.AUTO_APPROVE) ||
hasPermission(Permission.AUTO_APPROVE_MOVIE)) &&
hasPermission(Permission.AUTO_APPROVE_TV)) &&
!editRequest && (
<p className="mt-6">
<Alert title="Auto Approval" type="info">
<Alert
title={intl.formatMessage(messages.autoapproval)}
type="info"
>
{intl.formatMessage(messages.requestadmin)}
</Alert>
</p>
Expand Down
1 change: 1 addition & 0 deletions src/i18n/locale/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,7 @@
"components.RequestModal.AdvancedRequester.loadingprofiles": "Loading profiles…",
"components.RequestModal.AdvancedRequester.qualityprofile": "Quality Profile",
"components.RequestModal.AdvancedRequester.rootfolder": "Root Folder",
"components.RequestModal.autoapproval": "Auto Approval",
"components.RequestModal.cancel": "Cancel Request",
"components.RequestModal.cancelling": "Cancelling…",
"components.RequestModal.cancelrequest": "This will remove your request. Are you sure you want to continue?",
Expand Down

0 comments on commit 8927c6d

Please sign in to comment.