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

5
ui/v2.5/src/components/Shared/ScrapeDialog.tsx
View File

@@ -36,10 +36,11 @@ export class ScrapeResult<T> {
) {
this.originalValue = originalValue ?? undefined;
this.newValue = newValue ?? undefined;
const hasNewValue = newValue !== undefined;
const valuesEqual = isEqual(originalValue, newValue);
this.useNewValue = useNewValue ?? (!!this.newValue && !valuesEqual);
this.scraped = !!this.newValue && !valuesEqual;
this.useNewValue = useNewValue ?? (hasNewValue && !valuesEqual);
this.scraped = hasNewValue && !valuesEqual;
}
public setOriginalValue(value?: T) {