inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/release/V2.5' into release/V2.5

Browse Source 
# Conflicts:
#	pom.xml
#	rm-automation/pom.xml
#	rm-community/pom.xml
#	rm-community/rm-community-repo/pom.xml
#	rm-community/rm-community-share/pom.xml
#	rm-enterprise/pom.xml
#	rm-enterprise/rm-enterprise-repo/pom.xml
#	rm-enterprise/rm-enterprise-share/pom.xml
This commit is contained in:
rlucanu
2019-07-09 13:50:04 +03:00
parent 32c467beec a606a343b3
commit f669cfdaea
2 changed files with 7 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
View File

@@ -485,7 +485,6 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
returnedObject.getResultSetMetaData().getLimitedBy(), returnedObject.getResultSetMetaData().getLimitedBy(),
PermissionEvaluationMode.EAGER, PermissionEvaluationMode.EAGER,
returnedObject.getResultSetMetaData().getSearchParameters())); returnedObject.getResultSetMetaData().getSearchParameters()));
filteringResultSet.setNumberFound(returnedObject.getNumberFound());
return filteringResultSet; return filteringResultSet;
} }
else else
@@ -499,7 +498,6 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
returnedObject.getResultSetMetaData().getLimitedBy(), returnedObject.getResultSetMetaData().getLimitedBy(),
PermissionEvaluationMode.EAGER, PermissionEvaluationMode.EAGER,
returnedObject.getResultSetMetaData().getSearchParameters())); returnedObject.getResultSetMetaData().getSearchParameters()));
filteringResultSet.setNumberFound(returnedObject.getNumberFound());
return filteringResultSet; return filteringResultSet;
} }
} }

28
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionScheduleImpl.java
View File

@@ -35,7 +35,6 @@ import java.util.Map;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.module.org_alfresco_module_rm.RecordsManagementServiceRegistry; import org.alfresco.module.org_alfresco_module_rm.RecordsManagementServiceRegistry;
import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel; import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.service.cmr.repository.ChildAssociationRef; import org.alfresco.service.cmr.repository.ChildAssociationRef;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
@@ -52,10 +51,7 @@ public class DispositionScheduleImpl implements DispositionSchedule,
private NodeService nodeService; private NodeService nodeService;
private RecordsManagementServiceRegistry services; private RecordsManagementServiceRegistry services;
private NodeRef dispositionDefinitionNodeRef; private NodeRef dispositionDefinitionNodeRef;
/** authentication helper */
private AuthenticationUtil authenticationUtil;
private List<DispositionActionDefinition> actions; private List<DispositionActionDefinition> actions;
private Map<String, DispositionActionDefinition> actionsById; private Map<String, DispositionActionDefinition> actionsById;
@@ -65,11 +61,6 @@ public class DispositionScheduleImpl implements DispositionSchedule,
/** Map of disposition definitions by disposition action name */ /** Map of disposition definitions by disposition action name */
private Map<String, DispositionActionDefinition> actionsByDispositionActionName; private Map<String, DispositionActionDefinition> actionsByDispositionActionName;
public void setAuthenticationUtil(AuthenticationUtil authenticationUtil)
{
this.authenticationUtil = authenticationUtil;
}
public DispositionScheduleImpl(RecordsManagementServiceRegistry services, NodeService nodeService, NodeRef nodeRef) public DispositionScheduleImpl(RecordsManagementServiceRegistry services, NodeService nodeService, NodeRef nodeRef)
{ {
@@ -109,18 +100,13 @@ public class DispositionScheduleImpl implements DispositionSchedule,
*/ */
public boolean isRecordLevelDisposition() public boolean isRecordLevelDisposition()
{ {
return authenticationUtil.runAsSystem(new AuthenticationUtil.RunAsWork<Boolean>() boolean result = false;
Boolean value = (Boolean)this.nodeService.getProperty(this.dispositionDefinitionNodeRef, PROP_RECORD_LEVEL_DISPOSITION);
if (value != null)
{ {
public Boolean doWork() throws Exception result = value.booleanValue();
{ }
Boolean value = (Boolean)nodeService.getProperty(dispositionDefinitionNodeRef, PROP_RECORD_LEVEL_DISPOSITION); return result;
if (value != null)
{
return value.booleanValue();
}
return null;
}
});
} }
/** /**