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

Merge branch 'feature-2.4/RM-3077_LinkedAndCutOffRecordsPropertiesNotAvailableForUsersWithNoAccessToLinkedFolder' into 'release/V2.4'

Browse Source 
Feature 2.4/rm 3077 linked and cut off records properties not available for users with no access to linked folder

Uses runAsSystem for obtaining instructions, recordCategory and categoryId in RecordsManagementNodeFormFilter.AddTransientProperties()

See merge request !94
This commit is contained in:
Roy Wetherall
2016-04-04 01:59:29 +01:00
parent 8e13464ad8 da5df7efbb
commit 77078d3445
1 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/forms/RecordsManagementNodeFormFilter.java
View File

@@ -269,7 +269,7 @@ public class RecordsManagementNodeFormFilter extends RecordsManagementFormFilter
* @param form * @param form
* @param nodeRef * @param nodeRef
*/ */
protected void addTransientProperties(Form form, final NodeRef nodeRef) protected void addTransientProperties(final Form form, final NodeRef nodeRef)
{ {
if (recordService.isRecord(nodeRef)) if (recordService.isRecord(nodeRef))
{ {
@@ -277,33 +277,36 @@ public class RecordsManagementNodeFormFilter extends RecordsManagementFormFilter
} }
// Need to get the disposition schedule as the system user. See RM-1727. // Need to get the disposition schedule as the system user. See RM-1727.
DispositionSchedule ds = runAsSystem(new RunAsWork<DispositionSchedule>() //Need to run all block as the system user, needed for disposition instructions, recordCategory and categoryId. See RM-3077.
runAsSystem(new RunAsWork<Void>()
{ {
@Override @Override
public DispositionSchedule doWork() public Void doWork() throws Exception
{ {
return getDispositionService().getDispositionSchedule(nodeRef); DispositionSchedule ds = getDispositionService().getDispositionSchedule(nodeRef);
if (ds != null)
{
String instructions = ds.getDispositionInstructions();
if (instructions != null)
{
addTransientPropertyField(form, TRANSIENT_DISPOSITION_INSTRUCTIONS, DataTypeDefinition.TEXT,
instructions);
}
NodeRef recordCategory = getDispositionService().getAssociatedRecordsManagementContainer(ds);
if (recordCategory != null)
{
String categoryId = (String) nodeService.getProperty(recordCategory, PROP_IDENTIFIER);
if (categoryId != null)
{
addTransientPropertyField(form, TRANSIENT_CATEGORY_ID, DataTypeDefinition.TEXT, categoryId);
}
}
}
return null;
} }
}); });
if (ds != null)
{
String instructions = ds.getDispositionInstructions();
if (instructions != null)
{
addTransientPropertyField(form, TRANSIENT_DISPOSITION_INSTRUCTIONS, DataTypeDefinition.TEXT, instructions);
}
NodeRef recordCategory = getDispositionService().getAssociatedRecordsManagementContainer(ds);
if (recordCategory != null)
{
String categoryId = (String)nodeService.getProperty(recordCategory, PROP_IDENTIFIER);
if (categoryId != null)
{
addTransientPropertyField(form, TRANSIENT_CATEGORY_ID, DataTypeDefinition.TEXT, categoryId);
}
}
}
} }
/** /**