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

Fix merge dialog select boxes display issue (#5299)

Browse Source
This commit is contained in:
WithoutPants
2024-09-25 14:04:42 +10:00
committed by GitHub
parent c45ae068fc
commit cef5b46f93
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -771,6 +771,7 @@ export const SceneMergeModal: React.FC<ISceneMergeModalProps> = ({
isMulti isMulti
onSelect={(items) => setSourceScenes(items)} onSelect={(items) => setSourceScenes(items)}
values={sourceScenes} values={sourceScenes}
menuPortalTarget={document.body}
/> />
</Col> </Col>
</Form.Group> </Form.Group>
@@ -803,6 +804,7 @@ export const SceneMergeModal: React.FC<ISceneMergeModalProps> = ({
<SceneSelect <SceneSelect
onSelect={(items) => setDestScene(items)} onSelect={(items) => setDestScene(items)}
values={destScene} values={destScene}
menuPortalTarget={document.body}
/> />
</Col> </Col>
</Form.Group> </Form.Group>

2
ui/v2.5/src/components/Tags/TagDetails/TagMergeDialog.tsx
View File

@@ -106,6 +106,7 @@ export const TagMergeModal: React.FC<ITagMergeModalProps> = ({
onSelect={(items) => setSrc(items)} onSelect={(items) => setSrc(items)}
values={src} values={src}
excludeIds={tag?.id ? [tag.id] : []} excludeIds={tag?.id ? [tag.id] : []}
menuPortalTarget={document.body}
/> />
</Col> </Col>
</Form.Group> </Form.Group>
@@ -129,6 +130,7 @@ export const TagMergeModal: React.FC<ITagMergeModalProps> = ({
onSelect={(items) => setDest(items[0])} onSelect={(items) => setDest(items[0])}
values={dest ? [dest] : undefined} values={dest ? [dest] : undefined}
excludeIds={tag?.id ? [tag.id] : []} excludeIds={tag?.id ? [tag.id] : []}
menuPortalTarget={document.body}
/> />
</Col> </Col>
</Form.Group> </Form.Group>

1
ui/v2.5/src/docs/en/Changelog/v0270.md
View File

@@ -29,6 +29,7 @@
* Scene Player now allows interacting with the controls before playing video, and errors no longer prevent interacting with the Scene Player. ([#5145](https://github.com/stashapp/stash/pull/5145)) * Scene Player now allows interacting with the controls before playing video, and errors no longer prevent interacting with the Scene Player. ([#5145](https://github.com/stashapp/stash/pull/5145))
### 🐛 Bug fixes ### 🐛 Bug fixes
* **[0.27.1]** Fixed dropdowns not displaying correctly in the merge dialogs.
* Fixed videos and images having incorrect dimensions when the orientation flag is set to a non-default value during scan. ([#5188](https://github.com/stashapp/stash/pull/5188), [#5189](https://github.com/stashapp/stash/pull/5189)) * Fixed videos and images having incorrect dimensions when the orientation flag is set to a non-default value during scan. ([#5188](https://github.com/stashapp/stash/pull/5188), [#5189](https://github.com/stashapp/stash/pull/5189))
* Fixed mp4 videos being incorrectly transcoded when the file has opus audio codec. ([#5030](https://github.com/stashapp/stash/pull/5030)) * Fixed mp4 videos being incorrectly transcoded when the file has opus audio codec. ([#5030](https://github.com/stashapp/stash/pull/5030))
* Fixed o-history being imported as view-history when importing from JSON. ([#5127](https://github.com/stashapp/stash/pull/5127)) * Fixed o-history being imported as view-history when importing from JSON. ([#5127](https://github.com/stashapp/stash/pull/5127))