Remove redundant fileCount from search result

This commit is contained in:
Eike Kettner 2020-12-06 22:53:18 +01:00
parent 21cd778c37
commit b338f18e98
4 changed files with 4 additions and 9 deletions

View File

@ -5079,7 +5079,6 @@ components:
- state
- date
- source
- fileCount
- tags
properties:
id:
@ -5113,9 +5112,6 @@ components:
$ref: "#/components/schemas/IdName"
folder:
$ref: "#/components/schemas/IdName"
fileCount:
type: integer
format: int32
attachments:
type: array
items:

View File

@ -213,7 +213,6 @@ trait Conversions {
i.concPerson.map(mkIdName),
i.concEquip.map(mkIdName),
i.folder.map(mkIdName),
i.fileCount,
Nil, //attachments
Nil, //tags
Nil, //customfields

View File

@ -473,12 +473,12 @@ previewMenu settings model item mainAttach =
[ i [ class "eye icon" ] []
]
in
if pageCount == 0 || (item.fileCount == 1 && pageCount == 1) then
if pageCount == 0 || (List.length item.attachments == 1 && pageCount == 1) then
div [ class "card-attachment-nav" ]
[ gotoFileBtn
]
else if item.fileCount == 1 then
else if List.length item.attachments == 1 then
div [ class "card-attachment-nav" ]
[ div [ class "ui small top attached basic icon buttons" ]
[ gotoFileBtn
@ -510,7 +510,7 @@ previewMenu settings model item mainAttach =
|> String.fromInt
|> text
, text "/"
, text (String.fromInt item.fileCount)
, text (List.length item.attachments |> String.fromInt)
, text ", "
, text (String.fromInt pageCount)
, text "p."

View File

@ -224,7 +224,7 @@ concerning =
fileCount : ItemTemplate
fileCount =
ItemTemplate (.fileCount >> String.fromInt)
ItemTemplate (.attachments >> List.length >> String.fromInt)