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

Make ItemMerge independent from the action

Browse Source
This commit is contained in:
eikek
2022-03-17 23:25:04 +01:00
parent c7b2a1271a
commit 288ed83b7f
6 changed files with 117 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -600,8 +600,11 @@ update texts bookmarkId lastViewedItemId env msg model =
case model.viewMode of
SelectView svm ->
let
action =
Api.mergeItemsTask env.flags
result =
Comp.ItemMerge.update env.flags lmsg svm.mergeModel
Comp.ItemMerge.update env.flags action lmsg svm.mergeModel
nextView =
case result.outcome of
@ -611,13 +614,13 @@ update texts bookmarkId lastViewedItemId env msg model =
Comp.ItemMerge.OutcomeNotYet ->
SelectView { svm | mergeModel = result.model }
Comp.ItemMerge.OutcomeMerged ->
Comp.ItemMerge.OutcomeActionDone ->
SearchView
model_ =
{ model | viewMode = nextView }
in
if result.outcome == Comp.ItemMerge.OutcomeMerged then
if result.outcome == Comp.ItemMerge.OutcomeActionDone then
update texts
bookmarkId
lastViewedItemId

13
modules/webapp/src/main/elm/Page/Search/View2.elm
View File

@ -129,8 +129,19 @@ itemPublishView texts settings flags svm =
itemMergeView : Texts -> UiSettings -> SelectViewModel -> List (Html Msg)
itemMergeView texts settings svm =
let
cfg =
{ infoMessage = texts.mergeInfoText
, warnMessage = texts.mergeDeleteWarn
, actionButton = texts.submitMerge
, actionTitle = texts.submitMergeTitle
, cancelTitle = texts.cancelMergeTitle
, actionSuccessful = texts.mergeSuccessful
, actionInProcess = texts.mergeInProcess
}
in
[ Html.map MergeItemsMsg
(Comp.ItemMerge.view texts.itemMerge settings svm.mergeModel)
(Comp.ItemMerge.view texts.itemMerge cfg settings svm.mergeModel)
]