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

Include archive infos in item detail

Browse Source
This commit is contained in:
Eike Kettner
2020-03-22 21:35:50 +01:00
parent cbc95b11e6
commit 7e6eec9533
3 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/store/src/main/scala/docspell/store/queries/QItem.scala
View File

@ -24,7 +24,8 @@ object QItem {
inReplyTo: Option[IdRef],
tags: Vector[RTag],
attachments: Vector[(RAttachment, FileMeta)],
sources: Vector[(RAttachmentSource, FileMeta)]
sources: Vector[(RAttachmentSource, FileMeta)],
archives: Vector[(RAttachmentArchive, FileMeta)]
) {
def filterCollective(coll: Ident): Option[ItemData] =
@ -76,6 +77,7 @@ object QItem {
.option
val attachs = RAttachment.findByItemWithMeta(id)
val sources = RAttachmentSource.findByItemWithMeta(id)
val archives = RAttachmentArchive.findByItemWithMeta(id)
val tags = RTag.findByItem(id)
@ -83,8 +85,9 @@ object QItem {
data <- q
att <- attachs
srcs <- sources
arch <- archives
ts <- tags
} yield data.map(d => ItemData(d._1, d._2, d._3, d._4, d._5, d._6, ts, att, srcs))
} yield data.map(d => ItemData(d._1, d._2, d._3, d._4, d._5, d._6, ts, att, srcs, arch))
}
case class ListItem(