mirror of
https://github.com/stashapp/stash.git
synced 2025-12-18 21:04:37 +03:00
Include studio code in scene merge dialog (#3803)
This commit is contained in:
@@ -58,6 +58,9 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
|
|||||||
const [title, setTitle] = useState<ScrapeResult<string>>(
|
const [title, setTitle] = useState<ScrapeResult<string>>(
|
||||||
new ScrapeResult<string>(dest.title)
|
new ScrapeResult<string>(dest.title)
|
||||||
);
|
);
|
||||||
|
const [code, setCode] = useState<ScrapeResult<string>>(
|
||||||
|
new ScrapeResult<string>(dest.code)
|
||||||
|
);
|
||||||
const [url, setURL] = useState<ScrapeResult<string>>(
|
const [url, setURL] = useState<ScrapeResult<string>>(
|
||||||
new ScrapeResult<string>(dest.url)
|
new ScrapeResult<string>(dest.url)
|
||||||
);
|
);
|
||||||
@@ -157,6 +160,9 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
|
|||||||
!dest.title
|
!dest.title
|
||||||
)
|
)
|
||||||
);
|
);
|
||||||
|
setCode(
|
||||||
|
new ScrapeResult(dest.code, sources.find((s) => s.code)?.code, !dest.code)
|
||||||
|
);
|
||||||
setURL(
|
setURL(
|
||||||
new ScrapeResult(dest.url, sources.find((s) => s.url)?.url, !dest.url)
|
new ScrapeResult(dest.url, sources.find((s) => s.url)?.url, !dest.url)
|
||||||
);
|
);
|
||||||
@@ -290,6 +296,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
|
|||||||
const hasValues = useMemo(() => {
|
const hasValues = useMemo(() => {
|
||||||
return hasScrapedValues([
|
return hasScrapedValues([
|
||||||
title,
|
title,
|
||||||
|
code,
|
||||||
url,
|
url,
|
||||||
date,
|
date,
|
||||||
rating,
|
rating,
|
||||||
@@ -306,6 +313,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
|
|||||||
]);
|
]);
|
||||||
}, [
|
}, [
|
||||||
title,
|
title,
|
||||||
|
code,
|
||||||
url,
|
url,
|
||||||
date,
|
date,
|
||||||
rating,
|
rating,
|
||||||
@@ -348,6 +356,11 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
|
|||||||
result={title}
|
result={title}
|
||||||
onChange={(value) => setTitle(value)}
|
onChange={(value) => setTitle(value)}
|
||||||
/>
|
/>
|
||||||
|
<ScrapedInputGroupRow
|
||||||
|
title={intl.formatMessage({ id: "scene_code" })}
|
||||||
|
result={code}
|
||||||
|
onChange={(value) => setCode(value)}
|
||||||
|
/>
|
||||||
<ScrapedInputGroupRow
|
<ScrapedInputGroupRow
|
||||||
title={intl.formatMessage({ id: "url" })}
|
title={intl.formatMessage({ id: "url" })}
|
||||||
result={url}
|
result={url}
|
||||||
@@ -532,6 +545,7 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
|
|||||||
return {
|
return {
|
||||||
id: dest.id,
|
id: dest.id,
|
||||||
title: title.getNewValue(),
|
title: title.getNewValue(),
|
||||||
|
code: code.getNewValue(),
|
||||||
url: url.getNewValue(),
|
url: url.getNewValue(),
|
||||||
date: date.getNewValue(),
|
date: date.getNewValue(),
|
||||||
rating100: rating.getNewValue(),
|
rating100: rating.getNewValue(),
|
||||||
|
|||||||
Reference in New Issue
Block a user