Skip to content
Snippets Groups Projects
Verified Commit 6bba8a88 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Merge branch 'dev' into f-tsv-file-to-xsl

parents a7ebfea6 4406cee4
No related branches found
No related tags found
No related merge requests found
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;
......@@ -11,7 +15,7 @@ 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.CheckNoAdditionalPropertiesPresent;
import caosdb.server.jobs.core.CheckNoOverridesPresent;
import caosdb.server.jobs.core.CheckPropValid;
import caosdb.server.permissions.EntityACL;
......@@ -24,11 +28,6 @@ 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 {
......@@ -392,7 +391,8 @@ public class AWIBoxLoan extends AWIBoxLoanModel {
if (!isBoxRecord(e) || !hasOnlyAllowedBoxProperties4RequestLoan(e)) {
return false;
}
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,7 +440,8 @@ public class AWIBoxLoan extends AWIBoxLoanModel {
setCuratorAsOwner(e);
}
setLoanRequestDate(e);
appendJob(e, CheckNoAdditionalPropertiesPresent.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);
......@@ -476,7 +477,8 @@ public class AWIBoxLoan extends AWIBoxLoanModel {
&& isPersonRecord(getContainer().get(0))
&& checkUniqueName(getContainer().get(0))
&& checkEmail(getContainer().get(0))) {
appendJob(getContainer().get(0), CheckNoAdditionalPropertiesPresent.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;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment