TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-05 10:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix condition for deleting custom field value

Browse Source
This commit is contained in:
Eike Kettner 2020-11-21 21:22:12 +01:00
parent 4059ef31c1
commit af1cca7d83
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/backend/src/main/scala/docspell/backend/ops/OCustomFields.scala
View File

@ -161,6 +161,7 @@ object OCustomFields {
val update =
for {
field <- OptionT(RCustomField.findByIdOrName(in.field, in.collective))
_ <- OptionT.liftF(logger.debug(s"Field found by '${in.field}': $field"))
n <- OptionT.liftF(RCustomFieldValue.deleteValue(field.id, in.item))
} yield n

5
modules/store/src/main/scala/docspell/store/records/RCustomFieldValue.scala
View File

@ -60,5 +60,8 @@ object RCustomFieldValue {
deleteFrom(table, Columns.itemId.is(item)).update.run
def deleteValue(fieldId: Ident, items: NonEmptyList[Ident]): ConnectionIO[Int] =
deleteFrom(table, and(Columns.id.is(fieldId), Columns.itemId.isIn(items))).update.run
deleteFrom(
table,
and(Columns.field.is(fieldId), Columns.itemId.isIn(items))
).update.run
}