TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-24 11:28:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to search view after successful merge

Browse Source
This commit is contained in:
eikek
2021-08-16 13:32:50 +02:00
parent a923351b09
commit 9478152a94
2 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
modules/webapp/src/main/elm/Page/Home/Update.elm
View File

@ -586,16 +586,36 @@ update mId key flags settings msg model =
Comp.ItemMerge.update flags lmsg svm.mergeModel
nextView =
if result.done then
SelectView { svm | action = NoneAction }
case result.outcome of
Comp.ItemMerge.OutcomeCancel ->
SelectView { svm | action = NoneAction }
else
SelectView { svm | mergeModel = result.model }
Comp.ItemMerge.OutcomeNotYet ->
SelectView { svm | mergeModel = result.model }
Comp.ItemMerge.OutcomeMerged ->
if settings.searchMenuVisible then
SearchView
else
SimpleView
model_ =
{ model | viewMode = nextView }
in
noSub
( { model | viewMode = nextView }
, Cmd.map MergeItemsMsg result.cmd
)
if result.outcome == Comp.ItemMerge.OutcomeMerged then
update mId
key
flags
settings
(DoSearch model.searchTypeDropdownValue)
model_
else
noSub
( model_
, Cmd.map MergeItemsMsg result.cmd
)
_ ->
noSub ( model, Cmd.none )