Revert RM-2123 Update Java API to filter with current user's clearance.

The circular dependency causes a problem when loading the Spring context.
Reverting to rethink the approach.

+review RM-47



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@103856 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tom Page
2015-05-08 09:26:27 +00:00
parent 5927722e4d
commit 1c62f51937
2 changed files with 10 additions and 32 deletions

View File

@@ -61,7 +61,6 @@ public class ClassificationServiceImpl extends ServiceBaseImpl
private AttributeService attributeService; // TODO What about other code (e.g. REST API) accessing the AttrService?
private NodeService nodeService;
private SecurityClearanceService securityClearanceService;
private ClassificationServiceDAO classificationServiceDao;
/** The classification levels currently configured in this server. */
@@ -71,7 +70,6 @@ public class ClassificationServiceImpl extends ServiceBaseImpl
public void setAttributeService(AttributeService service) { this.attributeService = service; }
public void setNodeService(NodeService service) { this.nodeService = service; }
public void setSecurityClearanceService(SecurityClearanceService service) { this.securityClearanceService = service; }
/** Set the object from which configuration options will be read. */
public void setClassificationServiceDAO(ClassificationServiceDAO classificationServiceDao) { this.classificationServiceDao = classificationServiceDao; }
@@ -209,7 +207,8 @@ public class ClassificationServiceImpl extends ServiceBaseImpl
{
return Collections.emptyList();
}
ClassificationLevel usersLevel = securityClearanceService.getUserSecurityClearance().getClearanceLevel();
// FIXME Currently assume user has highest security clearance, this should be fixed as part of RM-2112.
ClassificationLevel usersLevel = levelManager.getMostSecureLevel();
return restrictList(levelManager.getClassificationLevels(), usersLevel);
}