Skip to content
Snippets Groups Projects

EHN: simplify CheckPropValid and add usefull info when permission denied

Open Timm Fitschen requested to merge f-useful-error-message-permission-denied into dev
2 files
+ 10
13
Compare changes
  • Side-by-side
  • Inline

Files

@@ -25,6 +25,7 @@ package org.caosdb.server.jobs.core;
import static org.caosdb.server.utils.ServerMessages.ENTITY_DOES_NOT_EXIST;
import com.google.common.base.Objects;
import org.apache.shiro.authz.AuthorizationException;
import org.caosdb.server.database.exceptions.EntityDoesNotExistException;
import org.caosdb.server.database.exceptions.EntityWasNotUniqueException;
import org.caosdb.server.entity.EntityInterface;
@@ -124,11 +125,14 @@ public class CheckPropValid extends EntityJob {
}
}
} catch (final Message m) {
addError(property, m);
property.addError(m);
} catch (AuthorizationException e) {
property.addError(ServerMessages.AUTHORIZATION_ERROR);
property.addInfo(e.getMessage());
} catch (final EntityDoesNotExistException e) {
addError(property, ENTITY_DOES_NOT_EXIST);
property.addError(ENTITY_DOES_NOT_EXIST);
} catch (final EntityWasNotUniqueException e) {
addError(property, ServerMessages.ENTITY_NAME_DUPLICATES);
property.addError(ServerMessages.ENTITY_NAME_DUPLICATES);
}
}
@@ -147,11 +151,6 @@ public class CheckPropValid extends EntityJob {
checkPermission(property, EntityPermission.USE_AS_PROPERTY);
}
private void addError(final EntityInterface property, final Message m) {
property.addError(m);
property.setEntityStatus(EntityStatus.UNQUALIFIED);
}
private static void deriveOverrideStatus(final Property child, final EntityInterface parent) {
if (!Objects.equal(child.getName(), parent.getName())) {
if (child.hasName()) {
Loading