diff --git a/caosdb-webui b/caosdb-webui index d5f9090eca25a92fc44dbeeba305768e8d9f4bcb..e6fef9f35da49dfea5b11f99b872d15c35fd043d 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 6143091a436934e1ca6051ec72cf8a7d34aab84b..7ed78405582ee98ab0c5e6a94d66cc90a980b782 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); } /**