Skip to content
Snippets Groups Projects
Unverified Commit 87c5aa85 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

BUG: load permanent jobs

parent 4ffeb022
No related branches found
No related tags found
No related merge requests found
......@@ -233,8 +233,12 @@ public abstract class Job extends AbstractObservable implements Observer {
if (flagName.length() > 0) {
allClasses.put(flagName.toLowerCase(), c);
}
if (c.getAnnotation(JobAnnotation.class).loadAlways()) {
loadAlways.add(c);
}
}
}
// TODO merge these two parts of this function. Its the same!
jobPackage = new Reflections("caosdb.server.jobs.extension");
allClassesSet = jobPackage.getSubTypesOf(Job.class);
for (final Class<? extends Job> c : allClassesSet) {
......
......@@ -18,6 +18,7 @@ import caosdb.server.permissions.EntityACL;
import caosdb.server.permissions.EntityACLFactory;
import caosdb.server.permissions.EntityPermission;
import caosdb.server.query.Query;
import caosdb.server.transaction.Delete;
import caosdb.server.transaction.Insert;
import caosdb.server.transaction.Update;
import caosdb.server.utils.EntityStatus;
......@@ -40,7 +41,8 @@ public class AWIBoxLoan extends AWIBoxLoanModel {
protected void run() {
try {
if (isAnonymous()
&& (isAcceptBorrowUpdateLoan()
&& (getTransaction() instanceof Delete
|| isAcceptBorrowUpdateLoan()
|| isConfirmLoanUpdateLoan()
|| isRejectReturnUpdateLoan()
|| isAcceptReturnUpdateLoan()
......@@ -66,7 +68,8 @@ public class AWIBoxLoan extends AWIBoxLoanModel {
}
try {
if (!(isRequestLoanSetUser()
if (!(getTransaction() instanceof Delete
|| isRequestLoanSetUser()
|| isRequestLoanInsertLoan()
|| isManualReturnUpdateLoan()
|| isManualReturnUpdateBox()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment