diff --git a/src/main/java/caosdb/server/jobs/extension/AWIBoxLoan.java b/src/main/java/caosdb/server/jobs/extension/AWIBoxLoan.java index 11f16aa1377d1c5c2ed8d0e28fcd27f12343b463..8df3bc2f8b798a8495f9bb670fa7ce23c5eba9c2 100644 --- a/src/main/java/caosdb/server/jobs/extension/AWIBoxLoan.java +++ b/src/main/java/caosdb/server/jobs/extension/AWIBoxLoan.java @@ -1,11 +1,7 @@ package caosdb.server.jobs.extension; import static caosdb.server.permissions.Role.ANONYMOUS_ROLE; -import java.util.Iterator; -import java.util.List; -import java.util.Objects; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + import caosdb.server.accessControl.UserSources; import caosdb.server.database.exceptions.EntityDoesNotExistException; import caosdb.server.datatype.SingleValue; @@ -15,8 +11,6 @@ import caosdb.server.entity.Message; import caosdb.server.entity.Message.MessageType; import caosdb.server.entity.wrapper.Property; import caosdb.server.jobs.JobAnnotation; -//import caosdb.server.jobs.core.CheckNoAdditionalPropertiesPresent; -import caosdb.server.jobs.core.CheckNoOverridesPresent; import caosdb.server.jobs.core.CheckPropValid; import caosdb.server.permissions.EntityACL; import caosdb.server.permissions.EntityACLFactory; @@ -28,6 +22,11 @@ import caosdb.server.transaction.Update; import caosdb.server.utils.EntityStatus; import caosdb.server.utils.ServerMessages; import caosdb.server.utils.Utils; +import java.util.Iterator; +import java.util.List; +import java.util.Objects; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; @JobAnnotation(transaction = caosdb.server.transaction.WriteTransaction.class, loadAlways = true) public class AWIBoxLoan extends AWIBoxLoanModel { @@ -391,8 +390,9 @@ public class AWIBoxLoan extends AWIBoxLoanModel { if (!isBoxRecord(e) || !hasOnlyAllowedBoxProperties4RequestLoan(e)) { return false; } - // TODO this breaks the box loan functionality if any other prior changes have been made to the box -// appendJob(e, CheckNoAdditionalPropertiesPresent.class); + // TODO this breaks the box loan functionality if any other prior changes have been made to + // the box + // appendJob(e, CheckNoAdditionalPropertiesPresent.class); } return true; } @@ -440,9 +440,10 @@ public class AWIBoxLoan extends AWIBoxLoanModel { setCuratorAsOwner(e); } setLoanRequestDate(e); - // TODO this check breaks the box loan functionality if any other changes have been made to the box entity -// appendJob(e, CheckNoAdditionalPropertiesPresent.class); - appendJob(e, CheckNoOverridesPresent.class); + // TODO this check breaks the box loan functionality if any other changes have been made to + // the box entity + // appendJob(e, CheckNoAdditionalPropertiesPresent.class); + // appendJob(e, CheckNoOverridesPresent.class); } appendJob(AWIBoxLoanRequestLoanCuratorEmail.class); return true; @@ -477,9 +478,10 @@ public class AWIBoxLoan extends AWIBoxLoanModel { && isPersonRecord(getContainer().get(0)) && checkUniqueName(getContainer().get(0)) && checkEmail(getContainer().get(0))) { - // TODO this check breaks the box loan functionality if any other changes have been made to the box entity -// appendJob(getContainer().get(0), CheckNoAdditionalPropertiesPresent.class); - appendJob(getContainer().get(0), CheckNoOverridesPresent.class); + // TODO this check breaks the box loan functionality if any other changes have been made to + // the box entity + // appendJob(getContainer().get(0), CheckNoAdditionalPropertiesPresent.class); + // appendJob(getContainer().get(0), CheckNoOverridesPresent.class); logger.trace("isRequestReturnSetUser: true"); return true; } @@ -538,7 +540,7 @@ public class AWIBoxLoan extends AWIBoxLoanModel { */ boolean hasOnlyAllowedLoanProperties4RequestReturn(EntityInterface e) { runJobFromSchedule(e, CheckPropValid.class); - appendJob(e, CheckNoOverridesPresent.class); + // appendJob(e, CheckNoOverridesPresent.class); boolean foundReturnRequested = false; for (Property p : e.getProperties()) {