This commit is contained in:
philip Vissenaekens
2015-12-16 11:50:13 +01:00
parent 1ea7305eba
commit b31496326c

View File

@@ -17,7 +17,6 @@ import org.dspace.authorize.ResourcePolicy;
import org.dspace.authorize.service.AuthorizeService;
import org.dspace.authorize.service.ResourcePolicyService;
import org.dspace.content.authority.Choices;
import org.dspace.content.authority.service.ChoiceAuthorityService;
import org.dspace.content.dao.ItemDAO;
import org.dspace.content.service.*;
import org.dspace.core.Constants;
@@ -747,13 +746,14 @@ public class ItemServiceImpl extends DSpaceObjectServiceImpl<Item> implements It
+ " has no default item READ policies");
}
// if come from InstallItem: remove all submission/workflow policies
authorizeService.removeAllPoliciesByDSOAndType(context, item, ResourcePolicy.TYPE_SUBMISSION);
authorizeService.removeAllPoliciesByDSOAndType(context, item, ResourcePolicy.TYPE_WORKFLOW);
try {
//We just removed all policies so only an admin will be able to add additional policies, ignore the authorizations for now.
//ignore the authorizations for now.
context.turnOffAuthorisationSystem();
// if come from InstallItem: remove all submission/workflow policies
authorizeService.removeAllPoliciesByDSOAndType(context, item, ResourcePolicy.TYPE_SUBMISSION);
authorizeService.removeAllPoliciesByDSOAndType(context, item, ResourcePolicy.TYPE_WORKFLOW);
// add default policies only if not already in place
List<ResourcePolicy> policiesToAdd = filterPoliciesToAdd(context, defaultCollectionPolicies, item);
authorizeService.addPolicies(context, policiesToAdd, item);