From e2545de347ad922f734d056ecf76ee7a7b7c79fd Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Sat, 14 Nov 2020 11:37:50 +0100 Subject: [PATCH] Make item-detail and item-light consistent in field naming This changes the public structure for an "item-light" as returned in search results. It makes unifying things easier if both names are the same. --- modules/restapi/src/main/resources/docspell-openapi.yml | 2 +- modules/webapp/src/main/elm/Comp/LinkTarget.elm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/restapi/src/main/resources/docspell-openapi.yml b/modules/restapi/src/main/resources/docspell-openapi.yml index 3b2ba5cd..36529d29 100644 --- a/modules/restapi/src/main/resources/docspell-openapi.yml +++ b/modules/restapi/src/main/resources/docspell-openapi.yml @@ -4756,7 +4756,7 @@ components: $ref: "#/components/schemas/IdName" concPerson: $ref: "#/components/schemas/IdName" - concEquip: + concEquipment: $ref: "#/components/schemas/IdName" folder: $ref: "#/components/schemas/IdName" diff --git a/modules/webapp/src/main/elm/Comp/LinkTarget.elm b/modules/webapp/src/main/elm/Comp/LinkTarget.elm index 625a276c..ca952e4d 100644 --- a/modules/webapp/src/main/elm/Comp/LinkTarget.elm +++ b/modules/webapp/src/main/elm/Comp/LinkTarget.elm @@ -36,7 +36,7 @@ makeCorrLink item tagger = makeConcLink : - { a | concPerson : Maybe IdName, concEquip : Maybe IdName } + { a | concPerson : Maybe IdName, concEquipment : Maybe IdName } -> (LinkTarget -> msg) -> List (Html msg) makeConcLink item tagger = @@ -47,7 +47,7 @@ makeConcLink item tagger = makeEquip idname = makeLink (LinkConcEquip >> tagger) idname in - combine (Maybe.map makePerson item.concPerson) (Maybe.map makeEquip item.concEquip) + combine (Maybe.map makePerson item.concPerson) (Maybe.map makeEquip item.concEquipment) makeFolderLink :