mirror of
https://github.com/TheAnachronism/docspell.git
synced 2025-06-05 22:55:58 +00:00
Automatically add wildcards to name search
If wildcards are already present or if the search string appears in quotes, wildcard '*' characters are not added.
This commit is contained in:
parent
6e4aeb512d
commit
35c9409680
@ -154,6 +154,17 @@ getItemSearch model =
|
|||||||
let
|
let
|
||||||
e =
|
e =
|
||||||
Api.Model.ItemSearch.empty
|
Api.Model.ItemSearch.empty
|
||||||
|
|
||||||
|
amendWildcards s =
|
||||||
|
if String.startsWith "\"" s && String.endsWith "\"" s then
|
||||||
|
String.dropLeft 1 s
|
||||||
|
|> String.dropRight 1
|
||||||
|
|
||||||
|
else if String.contains "*" s then
|
||||||
|
s
|
||||||
|
|
||||||
|
else
|
||||||
|
"*" ++ s ++ "*"
|
||||||
in
|
in
|
||||||
{ e
|
{ e
|
||||||
| tagsInclude = Comp.Dropdown.getSelected model.tagInclModel |> List.map .id
|
| tagsInclude = Comp.Dropdown.getSelected model.tagInclModel |> List.map .id
|
||||||
@ -168,7 +179,9 @@ getItemSearch model =
|
|||||||
, dateUntil = model.untilDate
|
, dateUntil = model.untilDate
|
||||||
, dueDateFrom = model.fromDueDate
|
, dueDateFrom = model.fromDueDate
|
||||||
, dueDateUntil = model.untilDueDate
|
, dueDateUntil = model.untilDueDate
|
||||||
, name = model.nameModel
|
, name =
|
||||||
|
model.nameModel
|
||||||
|
|> Maybe.map amendWildcards
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -493,9 +506,10 @@ view settings model =
|
|||||||
]
|
]
|
||||||
[]
|
[]
|
||||||
, span [ class "small-info" ]
|
, span [ class "small-info" ]
|
||||||
[ text "May contain wildcard "
|
[ text "Use wildcards "
|
||||||
, code [] [ text "*" ]
|
, code [] [ text "*" ]
|
||||||
, text " at beginning or end"
|
, text " at beginning or end. Added automatically if not "
|
||||||
|
, text "present and not quoted."
|
||||||
]
|
]
|
||||||
]
|
]
|
||||||
, formHeader (Icons.tagsIcon "") "Tags"
|
, formHeader (Icons.tagsIcon "") "Tags"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user