Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix country selector in bulk performer edit dialog #4565

Merged
merged 2 commits into from
Feb 16, 2024
Merged

Fix country selector in bulk performer edit dialog #4565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1cf42f8
Fix country select in edit performers dialog
WithoutPants Feb 14, 2024
4a5cdc3
Fix edit performer dialog height
WithoutPants Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 14 additions & 3 deletions ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import { IndeterminateCheckbox } from "../Shared/IndeterminateCheckbox";
import { BulkUpdateTextInput } from "../Shared/BulkUpdateTextInput";
import { faPencilAlt } from "@fortawesome/free-solid-svg-icons";
import * as FormUtils from "src/utils/form";
import { CountrySelect } from "../Shared/CountrySelect";

interface IListOperationProps {
selected: GQL.SlimPerformerDataFragment[];
Expand Down Expand Up @@ -222,6 +223,7 @@ export const EditPerformersDialog: React.FC<IListOperationProps> = (
function render() {
return (
<ModalComponent
dialogClassName="edit-performers-dialog"
show
icon={faPencilAlt}
header={intl.formatMessage(
Expand Down Expand Up @@ -293,9 +295,18 @@ export const EditPerformersDialog: React.FC<IListOperationProps> = (
{renderTextField("death_date", updateInput.death_date, (v) =>
setUpdateField({ death_date: v })
)}
{renderTextField("country", updateInput.country, (v) =>
setUpdateField({ country: v })
)}

<Form.Group>
<Form.Label>
<FormattedMessage id="country" />
</Form.Label>
<CountrySelect
value={updateInput.country ?? ""}
onChange={(v) => setUpdateField({ country: v })}
showFlag
/>
</Form.Group>

{renderTextField("ethnicity", updateInput.ethnicity, (v) =>
setUpdateField({ ethnicity: v })
)}
Expand Down
6 changes: 6 additions & 0 deletions ui/v2.5/src/components/Performers/styles.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,3 +236,9 @@
max-width: 50px;
}
}

.edit-performers-dialog .modal-body {
max-height: calc(100vh - 12rem);
overflow-y: auto;
padding-right: 1.5rem;
}