Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-17 20:34:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Include organized field in merge dialog (#3565)

Browse Source
This commit is contained in:
WithoutPants
2023-03-22 10:54:45 +11:00
committed by GitHub
parent fc7c3f588e
commit fcfbdc47bc
2 changed files with 41 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
View File

@@ -117,6 +117,10 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
const [stashIDs, setStashIDs] = useState(new ScrapeResult<GQL.StashId[]>([]));
const [organized, setOrganized] = useState(
new ScrapeResult<boolean>(dest.organized)
);
const [image, setImage] = useState<ScrapeResult<string>>(
new ScrapeResult<string>(dest.paths.screenshot)
);
@@ -228,6 +232,13 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
)
);
setOrganized(
new ScrapeResult(
dest.organized ?? false,
sources.every((s) => s.organized)
)
);
setStashIDs(
new ScrapeResult(
dest.stash_ids,
@@ -287,6 +298,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
movies,
tags,
details,
organized,
stashIDs,
image,
]);
@@ -302,6 +314,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
movies,
tags,
details,
organized,
stashIDs,
image,
]);
@@ -323,6 +336,9 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
);
}
const trueString = intl.formatMessage({ id: "true" });
const falseString = intl.formatMessage({ id: "false" });
return (
<>
<ScrapedInputGroupRow
@@ -463,6 +479,27 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
result={details}
onChange={(value) => setDetails(value)}
/>
<ScrapeDialogRow
title={intl.formatMessage({ id: "organized" })}
result={organized}
renderOriginalField={() => (
<FormControl
value={organized.originalValue ? trueString : falseString}
readOnly
onChange={() => {}}
className="bg-secondary text-white border-secondary"
/>
)}
renderNewField={() => (
<FormControl
value={organized.newValue ? trueString : falseString}
readOnly
onChange={() => {}}
className="bg-secondary text-white border-secondary"
/>
)}
onChange={(value) => setOrganized(value)}
/>
<ScrapeDialogRow
title={intl.formatMessage({ id: "stash_id" })}
result={stashIDs}
@@ -515,6 +552,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
}),
tag_ids: tags.getNewValue(),
details: details.getNewValue(),
organized: organized.getNewValue(),
stash_ids: stashIDs.getNewValue(),
cover_image: coverImage,
};