TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-09-30 00:28:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix item selection after merge

Browse Source 
Issue: #1809
This commit is contained in:
eikek
2022-11-07 17:14:33 +01:00
parent dc061b10a6
commit e701040212
3 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
modules/webapp/src/main/elm/Page/Search/Update.elm
View File

@@ -620,25 +620,26 @@ update texts bookmarkId lastViewedItemId env msg model =
Comp.ItemMerge.OutcomeNotYet ->
SelectView { svm | mergeModel = createModel result.model }
Comp.ItemMerge.OutcomeActionDone ->
Comp.ItemMerge.OutcomeActionDone _ ->
SearchView
model_ =
{ model | viewMode = nextView }
in
if result.outcome == Comp.ItemMerge.OutcomeActionDone then
update texts
bookmarkId
lastViewedItemId
env
(DoSearch model.searchTypeDropdownValue)
model_
case result.outcome of
Comp.ItemMerge.OutcomeActionDone target ->
update texts
bookmarkId
lastViewedItemId
{ env | selectedItems = Data.ItemIds.maybeOne <| Maybe.map .id target }
(DoSearch model.searchTypeDropdownValue)
model_
else
resultModelCmd env.selectedItems
( model_
, Cmd.map MergeItemsMsg result.cmd
)
_ ->
resultModelCmd env.selectedItems
( model_
, Cmd.map MergeItemsMsg result.cmd
)
_ ->
resultModelCmd env.selectedItems ( model, Cmd.none )