Skip to content

Commit

Permalink
Fix country selector in bulk performer edit dialog (stashapp#4565)
Browse files Browse the repository at this point in the history
* Fix country select in edit performers dialog
* Fix edit performer dialog height
  • Loading branch information
WithoutPants authored and halkeye committed Sep 1, 2024
1 parent 8cc7ab1 commit e082719
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 3 deletions.
17 changes: 14 additions & 3 deletions ui/v2.5/src/components/Performers/EditPerformersDialog.tsx
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
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;
}

0 comments on commit e082719

Please sign in to comment.