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

RM-3181 and RM-3195 - error accessing caveatConfig.json after modifications

Browse Source 
Caveat config file had filePlanComponent applied, but wasn't contained
within a file plan.
This commit is contained in:
Roy Wetherall
2016-04-05 14:38:36 +10:00
parent 2858241aed
commit d5031599fa
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/model/recordsModel.xml
View File

@@ -41,9 +41,6 @@
<title>Caveat Config</title> <title>Caveat Config</title>
<parent>cm:content</parent> <parent>cm:content</parent>
<archive>false</archive> <archive>false</archive>
<mandatory-aspects>
<aspect>rma:filePlanComponent</aspect>
</mandatory-aspects>
</type> </type>
<type name="rma:emailConfig"> <type name="rma:emailConfig">

3
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMSecurityCommon.java
View File

@@ -244,7 +244,8 @@ public class RMSecurityCommon implements ApplicationContextAware
{ {
// Get the file plan for the node // Get the file plan for the node
NodeRef filePlan = getFilePlanService().getFilePlan(nodeRef); NodeRef filePlan = getFilePlanService().getFilePlan(nodeRef);
if (hasViewCapability(filePlan) == AccessStatus.DENIED) if (filePlan != null &&
hasViewCapability(filePlan) == AccessStatus.DENIED)
{ {
if (logger.isDebugEnabled()) if (logger.isDebugEnabled())
{ {

5
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
View File

@@ -411,7 +411,10 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JS
// File plan node reference // File plan node reference
NodeRef filePlan = filePlanService.getFilePlan(nodeRef); NodeRef filePlan = filePlanService.getFilePlan(nodeRef);
result.put("filePlan", filePlan.toString()); if (filePlan != null)
{
result.put("filePlan", filePlan.toString());
}
// Unfiled container node reference // Unfiled container node reference
NodeRef unfiledRecordContainer = filePlanService.getUnfiledContainer(filePlan); NodeRef unfiledRecordContainer = filePlanService.getUnfiledContainer(filePlan);