From 352f3aea4c5ccf4bb598b7dd1a0cc18b9697c9ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Thu, 24 Oct 2024 15:50:00 +0200
Subject: [PATCH] FIX: insert person created by insert_or_update person
---
loanpy/src/loan/accept_loan_request.py | 2 +-
loanpy/src/loan/accept_return_request.py | 2 +-
loanpy/src/loan/box_loan.py | 2 +-
loanpy/src/loan/confirm_loan.py | 2 +-
loanpy/src/loan/manual_return.py | 2 +-
loanpy/src/loan/reject_return_request.py | 2 +-
loanpy/src/loan/request_return.py | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/loanpy/src/loan/accept_loan_request.py b/loanpy/src/loan/accept_loan_request.py
index 4d79edc..ca89c7c 100755
--- a/loanpy/src/loan/accept_loan_request.py
+++ b/loanpy/src/loan/accept_loan_request.py
@@ -23,7 +23,7 @@ Accept a loan request.
from __future__ import absolute_import
import caosdb as db
from caosadvancedtools.serverside.helper import print_success, get_timestamp
-from .box_loan import (main, get_loan, F_LOAN,
+from .box_loan import (main, get_loan, F_LOAN,update_loan_state,
LOAN_ACCEPTED, S_LOAN_ACCEPTED, S_LOAN_REQUESTED,
get_borrower_names, set_property)
diff --git a/loanpy/src/loan/accept_return_request.py b/loanpy/src/loan/accept_return_request.py
index 7a647e0..045f967 100755
--- a/loanpy/src/loan/accept_return_request.py
+++ b/loanpy/src/loan/accept_return_request.py
@@ -25,7 +25,7 @@ from __future__ import absolute_import
import caosdb as db
from caosadvancedtools.serverside.helper import print_success, get_timestamp
from .box_loan import (BOX_BORROWED, CONTENT, main, get_loan, set_property,
- F_LOAN, RETURN_ACCEPTED,
+ F_LOAN, RETURN_ACCEPTED,update_loan_state,
RETURNLOCATION, S_RETURN_ACCEPTED, S_RETURN_REQUESTED,
get_borrower_names, set_location_of_borrowed_items)
diff --git a/loanpy/src/loan/box_loan.py b/loanpy/src/loan/box_loan.py
index bf2a362..fea7172 100644
--- a/loanpy/src/loan/box_loan.py
+++ b/loanpy/src/loan/box_loan.py
@@ -493,7 +493,7 @@ def insert_or_update_person(firstname, lastname, email):
return person
except EmptyUniqueQueryError:
- return create_person(firstname, lastname, email)
+ return create_person(firstname, lastname, email).insert()
def set_property(entity, prop, value, case_sensitive=True):
diff --git a/loanpy/src/loan/confirm_loan.py b/loanpy/src/loan/confirm_loan.py
index e21496f..d2c69b0 100755
--- a/loanpy/src/loan/confirm_loan.py
+++ b/loanpy/src/loan/confirm_loan.py
@@ -26,7 +26,7 @@ import caosdb as db
from caosadvancedtools.serverside.helper import get_timestamp, print_success
from .box_loan import (BOX, BOX_BORROWED, DESTINATION, F_LOAN, LENT, S_LENT,
- S_LOAN_ACCEPTED, get_borrower_names,
+ S_LOAN_ACCEPTED, get_borrower_names,update_loan_state,
get_loan, main, set_location_of_borrowed_items, set_property)
diff --git a/loanpy/src/loan/manual_return.py b/loanpy/src/loan/manual_return.py
index 0bb6bce..1fe79b1 100755
--- a/loanpy/src/loan/manual_return.py
+++ b/loanpy/src/loan/manual_return.py
@@ -27,7 +27,7 @@ from caosadvancedtools.serverside.helper import get_timestamp, print_success
from .box_loan import (BOX, BOX_BORROWED, BOX_RETURNED, CONTENT, F_LOAN,
RETURNED, RETURNLOCATION, S_RETURN_ACCEPTED, S_RETURNED,
- get_borrower_names, get_loan, main,
+ get_borrower_names, get_loan, main,update_loan_state,
set_location_of_borrowed_items, set_property)
diff --git a/loanpy/src/loan/reject_return_request.py b/loanpy/src/loan/reject_return_request.py
index 0c06823..c381f18 100755
--- a/loanpy/src/loan/reject_return_request.py
+++ b/loanpy/src/loan/reject_return_request.py
@@ -23,7 +23,7 @@ Reject a return request.
from __future__ import absolute_import
import caosdb as db
from caosadvancedtools.serverside.helper import print_success
-from .box_loan import (main, get_loan, F_LOAN,
+from .box_loan import (main, get_loan, F_LOAN,update_loan_state,
S_RETURN_REQUESTED, RETURN_REQUESTED, S_LENT,
get_borrower_names)
diff --git a/loanpy/src/loan/request_return.py b/loanpy/src/loan/request_return.py
index 823e0ce..347e613 100755
--- a/loanpy/src/loan/request_return.py
+++ b/loanpy/src/loan/request_return.py
@@ -30,7 +30,7 @@ from caosadvancedtools.serverside.helper import get_timestamp, print_success
from .box_loan import (BORROWER, COMMENT, CONTENT, EXPECTED_RETURN, F_COMMENT,
F_CURRENT_LOCATION, F_EMAIL, F_EXPECTED_RETURN_DATE,
- F_FIRST_NAME, F_LAST_NAME, F_LOAN, FIRST_NAME, LAST_NAME,
+ F_FIRST_NAME, F_LAST_NAME, F_LOAN, FIRST_NAME, LAST_NAME,update_loan_state,
RETURN_REQUESTED, RETURNLOCATION, S_LENT,
assert_date_in_future, assert_key_in_data,
get_loan, insert_or_update_person, main,
--
GitLab