From 9b088c44e265de47493f5b456296d0416677d2da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <h.tomwoerden@indiscale.com>
Date: Sat, 2 Dec 2023 12:51:34 +0100
Subject: [PATCH] wip
---
caosdb-webui | 2 +-
.../transaction/RetrieveFullEntityTransaction.java | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/caosdb-webui b/caosdb-webui
index d5f9090e..e6fef9f3 160000
--- a/caosdb-webui
+++ b/caosdb-webui
@@ -1 +1 @@
-Subproject commit d5f9090eca25a92fc44dbeeba305768e8d9f4bcb
+Subproject commit e6fef9f35da49dfea5b11f99b872d15c35fd043d
diff --git a/src/main/java/org/caosdb/server/database/backend/transaction/RetrieveFullEntityTransaction.java b/src/main/java/org/caosdb/server/database/backend/transaction/RetrieveFullEntityTransaction.java
index 6143091a..7ed78405 100644
--- a/src/main/java/org/caosdb/server/database/backend/transaction/RetrieveFullEntityTransaction.java
+++ b/src/main/java/org/caosdb/server/database/backend/transaction/RetrieveFullEntityTransaction.java
@@ -236,15 +236,18 @@ public class RetrieveFullEntityTransaction extends BackendTransaction {
if (this.subject != null) {
System.out.println(((Principal) this.subject.getPrincipal()).getUsername());
+
+ // final EntityInterface e =
+ // execute(new RetrieveSparseEntity(q.getKey(), null), query.getAccess()).getEntity();
// check whether the referenced entity may be retrieved
+ // recursion! (Only for the matching selections)
+ retrieveFullEntity(ref, getSubSelects(selections, propertyName));
final EntityACL entityACL = ref.getEntityACL();
if (!entityACL.isPermitted(this.subject, EntityPermission.RETRIEVE_ENTITY)) {
return;
}
+ value.setEntity(ref, true);
}
- // recursion! (Only for the matching selections)
- retrieveFullEntity(ref, getSubSelects(selections, propertyName));
- value.setEntity(ref, true);
}
/**
--
GitLab