inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Record only merge of version change."

Browse Source 
This reverts commit 6e197f2a2d, reversing
changes made to 211244279a.
This commit is contained in:
rlucanu
2019-07-09 12:12:28 +03:00
parent 6e197f2a2d
commit a606a343b3
7 changed files with 13 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@@ -4,7 +4,7 @@
<groupId>org.alfresco</groupId>
<artifactId>alfresco-rm</artifactId>
<packaging>pom</packaging>
<version>2.5.5-SNAPSHOT</version>
<version>2.5.3.3-SNAPSHOT</version>
<name>Alfresco Records Management</name>
<parent>
@@ -24,7 +24,7 @@
<connection>scm:git:https://git.alfresco.com/records-management/records-management.git</connection>
<developerConnection>scm:git:https://git.alfresco.com/records-management/records-management.git</developerConnection>
<url>https://git.alfresco.com/records-management/records-management</url>
<tag>HEAD</tag>
<tag>V2.5.3</tag>
</scm>
<issueManagement>

2
rm-automation/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-rm</artifactId>
<version>2.5.5-SNAPSHOT</version>
<version>2.5.3.3-SNAPSHOT</version>
</parent>
<properties>

2
rm-community/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-rm</artifactId>
<version>2.5.5-SNAPSHOT</version>
<version>2.5.3.3-SNAPSHOT</version>
</parent>
<licenses>

2
rm-community/rm-community-repo/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-rm-community</artifactId>
<version>2.5.5-SNAPSHOT</version>
<version>2.5.3.3-SNAPSHOT</version>
</parent>
<properties>

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

26
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.module.org_alfresco_module_rm.RecordsManagementServiceRegistry;
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.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
@@ -52,9 +51,6 @@ public class DispositionScheduleImpl implements DispositionSchedule,
private NodeService nodeService;
private RecordsManagementServiceRegistry services;
private NodeRef dispositionDefinitionNodeRef;
/** authentication helper */
private AuthenticationUtil authenticationUtil;
private List<DispositionActionDefinition> actions;
private Map<String, DispositionActionDefinition> actionsById;
@@ -66,11 +62,6 @@ public class DispositionScheduleImpl implements DispositionSchedule,
/** Map of disposition definitions by disposition action name */
private Map<String, DispositionActionDefinition> actionsByDispositionActionName;
public void setAuthenticationUtil(AuthenticationUtil authenticationUtil)
{
this.authenticationUtil = authenticationUtil;
}
public DispositionScheduleImpl(RecordsManagementServiceRegistry services, NodeService nodeService, NodeRef nodeRef)
{
// TODO check that we have a disposition definition node reference
@@ -109,18 +100,13 @@ public class DispositionScheduleImpl implements DispositionSchedule,
*/
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
{
Boolean value = (Boolean)nodeService.getProperty(dispositionDefinitionNodeRef, PROP_RECORD_LEVEL_DISPOSITION);
if (value != null)
{
return value.booleanValue();
}
return null;
}
});
result = value.booleanValue();
}
return result;
}
/**

5
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
View File

@@ -348,9 +348,6 @@ public class DispositionServiceImpl extends ServiceBaseImpl
return ds;
}
/**
* This method returns a NodeRef
* Gets the disposition instructions
@@ -383,7 +380,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl
NodeRef result = getAssociatedDispositionScheduleImpl(parent);
if (result == null)
{
return null;
return getOriginDispositionSchedule(parent);
}
return new DispositionScheduleImpl(serviceRegistry, nodeService, result);
}