From 58fd499ed1b0b823d9b04e1d347f36cca17d4d86 Mon Sep 17 00:00:00 2001
From: Florian Spreckelsen <f.spreckelsen@indiscale.com>
Date: Thu, 13 Mar 2025 14:06:22 +0100
Subject: [PATCH] FIX: Actually remove name overrides
---
loanpy/src/loan/confirm_loan.py | 3 ++-
loanpy/src/loan/manual_return.py | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/loanpy/src/loan/confirm_loan.py b/loanpy/src/loan/confirm_loan.py
index 3ef14d5..183a1c4 100755
--- a/loanpy/src/loan/confirm_loan.py
+++ b/loanpy/src/loan/confirm_loan.py
@@ -33,7 +33,8 @@ from .box_loan import (BOX, BOX_BORROWED, DESTINATION, F_LOAN, LENT, S_LENT, S_L
def _set_lent_box(loan):
""" Store the exact versions of borrowed items when it was delivered to the borrower. """
references = set_references_to_current_version(loan.get_property(BOX).value)
- loan.add_property(id=BOX.id, name=BOX_BORROWED.name, value=references,
+ borrowed_prop = db.get_entity_by_name(BOX_BORROWED.name, role="PROPERTY")
+ loan.add_property(id=borrowed_prop.id, value=references,
datatype=db.LIST(BOX.name) if isinstance(references, list) else BOX.name)
loan.update()
diff --git a/loanpy/src/loan/manual_return.py b/loanpy/src/loan/manual_return.py
index b82e600..8b0facb 100755
--- a/loanpy/src/loan/manual_return.py
+++ b/loanpy/src/loan/manual_return.py
@@ -37,7 +37,8 @@ def _set_returned_box(loan):
This stores the version of the box that was returned by a borrower.
"""
references = set_references_to_current_version(loan.get_property(BOX_BORROWED.name).value)
- loan.add_property(id=BOX.id, name=BOX_RETURNED.name, value=references,
+ returned_prop = db.get_entity_by_name(BOX_RETURNED.name, role="PROPERTY")
+ loan.add_property(id=returned_prop.id, value=references,
datatype=db.LIST(BOX.name) if isinstance(references, list) else BOX.name)
--
GitLab