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/V3.4' into feature-3.4/APPS-594_Intermittent_openPage_no

Browse Source
This commit is contained in:
Claudia Agache
2020-12-11 11:25:37 +02:00
parent 39751dfc84 b7001dbbf3
commit 53b98b7330
7 changed files with 7 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -4,7 +4,7 @@
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services</artifactId>
<packaging>pom</packaging>
<version>3.4.1-SNAPSHOT</version>
<version>3.4.2-SNAPSHOT</version>
<name>Alfresco Governance Services</name>
<url>http://www.alfresco.org/</url>

2
rm-automation/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services</artifactId>
<version>3.4.1-SNAPSHOT</version>
<version>3.4.2-SNAPSHOT</version>
</parent>
<licenses>

2
rm-automation/rm-automation-community-rest-api/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-automation</artifactId>
<version>3.4.1-SNAPSHOT</version>
<version>3.4.2-SNAPSHOT</version>
</parent>
<properties>

2
rm-community/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services</artifactId>
<version>3.4.1-SNAPSHOT</version>
<version>3.4.2-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-governance-services-community</artifactId>
<version>3.4.1-SNAPSHOT</version>
<version>3.4.2-SNAPSHOT</version>
</parent>
<properties>

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

@@ -503,52 +503,7 @@ public class DispositionServiceImpl extends ServiceBaseImpl
@Override
public boolean hasDisposableItems(DispositionSchedule dispositionSchdule)
{
ParameterCheck.mandatory("dispositionSchedule", dispositionSchdule);
// Get the associated container
NodeRef rmContainer = getAssociatedRecordsManagementContainer(dispositionSchdule);
return hasDisposableItemsImpl(dispositionSchdule.isRecordLevelDisposition(), rmContainer);
}
/**
* Method that provides a boolean if given Records Management Container has disposable items.
* This method is similar to getDisposableItemsImpl(boolean isRecordLevelDisposition, NodeRef rmContainer) but with improved performance:
* For RecordLevelDisposition it will limit Record retrieval to 1.
* Early returns once the first occurrence is found.
* @param isRecordLevelDisposition
* @param rmContainer
* @return
*/
private boolean hasDisposableItemsImpl(boolean isRecordLevelDisposition, NodeRef rmContainer)
{
List<NodeRef> items = filePlanService.getAllContained(rmContainer);
for (NodeRef item : items)
{
if (recordFolderService.isRecordFolder(item))
{
if (isRecordLevelDisposition)
{
List<ChildAssociationRef> assocs = nodeService.getChildAssocs(item, ContentModel.ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL, 1, true);
if (!assocs.isEmpty())
{
return true;
}
}
else
{
return true;
}
}
else if (filePlanService.isRecordCategory(item) && getAssociatedDispositionScheduleImpl(item) == null)
{
if (hasDisposableItemsImpl(isRecordLevelDisposition, item));
{
return true;
}
}
}
return false;
return !getDisposableItems(dispositionSchdule).isEmpty();
}
/**

2
rm-community/rm-community-rest-api-explorer/pom.xml
View File

@@ -7,7 +7,7 @@
<parent>
<groupId>org.alfresco</groupId>
<artifactId>alfresco-governance-services-community</artifactId>
<version>3.4.1-SNAPSHOT</version>
<version>3.4.2-SNAPSHOT</version>
</parent>
<properties>