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

Allow to search in deleted items

Browse Source
This commit is contained in:
eikek
2021-08-14 15:35:17 +02:00
parent edb344314f
commit 3f1ff5c1ac
5 changed files with 98 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/webapp/src/main/elm/Page/Home/Data.elm
View File

@ -239,7 +239,7 @@ doSearchDefaultCmd : SearchParam -> Model -> Cmd Msg
doSearchDefaultCmd param model =
let
smask =
Q.request <|
Q.request model.searchMenuModel.searchMode <|
Q.and
[ Comp.SearchMenu.getItemQuery model.searchMenuModel
, Maybe.map Q.Fragment model.powerSearchInput.input

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

@ -23,6 +23,7 @@ import Data.Flags exposing (Flags)
import Data.ItemQuery as Q
import Data.ItemSelection
import Data.Items
import Data.SearchMode exposing (SearchMode)
import Data.UiSettings exposing (UiSettings)
import Page exposing (Page(..))
import Page.Home.Data exposing (..)
@ -548,7 +549,7 @@ update mId key flags settings msg model =
case model.viewMode of
SelectView svm ->
-- replace changed items in the view
noSub ( nm, loadChangedItems flags svm.ids )
noSub ( nm, loadChangedItems flags model.searchMenuModel.searchMode svm.ids )
_ ->
noSub ( nm, Cmd.none )
@ -717,8 +718,8 @@ replaceItems model newItems =
{ model | itemListModel = newList }
loadChangedItems : Flags -> Set String -> Cmd Msg
loadChangedItems flags ids =
loadChangedItems : Flags -> SearchMode -> Set String -> Cmd Msg
loadChangedItems flags smode ids =
if Set.isEmpty ids then
Cmd.none
@ -728,7 +729,7 @@ loadChangedItems flags ids =
Set.toList ids
searchInit =
Q.request (Just <| Q.ItemIdIn idList)
Q.request smode (Just <| Q.ItemIdIn idList)
search =
{ searchInit