TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 18:38:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restrict person dropdown options to the associated organization

Browse Source
This commit is contained in:
Eike Kettner
2020-12-01 00:28:58 +01:00
parent a6dd71af9f
commit d4470ab5fd
3 changed files with 80 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
modules/webapp/src/main/elm/Comp/ItemDetail/Update.elm
View File

@ -252,6 +252,7 @@ update key flags inav settings msg model =
, getOptions flags
, proposalCmd
, Api.getSentMails flags item.id SentMailsResp
, Api.getPersons flags "" GetPersonResp
, Cmd.map CustomFieldMsg (Comp.CustomFieldMultiInput.initCmd flags)
]
, sub =
@ -347,12 +348,14 @@ update key flags inav settings msg model =
( m2, c2 ) =
Comp.Dropdown.update m model.corrOrgModel
newModel =
{ model | corrOrgModel = m2 }
idref =
Comp.Dropdown.getSelected m2 |> List.head
newModel =
{ model
| corrOrgModel = m2
}
save =
if isDropdownChangeMsg m then
setCorrOrg flags newModel idref
@ -609,11 +612,46 @@ update key flags inav settings msg model =
( conc, corr ) =
List.partition .concerning ps.items
personDict =
List.map (\p -> ( p.id, p )) ps.items
|> Dict.fromList
corrOrg =
Comp.Dropdown.getSelected model.corrOrgModel
|> List.head
personFilter =
case corrOrg of
Just n ->
\p -> p.organization == Just n
Nothing ->
\_ -> True
concRefs =
List.map (\e -> IdName e.id e.name) conc
corrRefs =
List.map (\e -> IdName e.id e.name) corr
List.filter personFilter corr
|> List.map (\e -> IdName e.id e.name)
mkPersonOption idref =
let
org =
Dict.get idref.id personDict
|> Maybe.andThen .organization
|> Maybe.map .name
|> Maybe.map (Util.String.ellipsis 15)
|> Maybe.withDefault ""
in
Comp.Dropdown.Option idref.id idref.name org
model_ =
{ model
| corrPersonModel = Comp.Dropdown.setMkOption mkPersonOption model.corrPersonModel
, concPersonModel = Comp.Dropdown.setMkOption mkPersonOption model.concPersonModel
, allPersons = personDict
}
res1 =
update key
@ -621,7 +659,7 @@ update key flags inav settings msg model =
inav
settings
(CorrPersonMsg (Comp.Dropdown.SetOptions corrRefs))
model
model_
res2 =
update key