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

Merged HEAD to V2.2:

Browse Source 
89735: RM-1677- No items error for RM Admin if record was declared from moderated/private site

* fixes RM-2018



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.2@99089 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2015-03-10 04:32:04 +00:00
parent ef7c4d6761
commit b605635eb6
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/jscript/app/JSONConversionComponent.java
View File

@@ -294,7 +294,7 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JSONC
if (originatingLocation != null) if (originatingLocation != null)
{ {
String pathSeparator = "/"; String pathSeparator = "/";
String displayPath = PathUtil.getDisplayPath(nodeService.getPath(originatingLocation), true); String displayPath = getDisplayPath(originatingLocation);
String[] displayPathElements = displayPath.split(pathSeparator); String[] displayPathElements = displayPath.split(pathSeparator);
Object[] subPath = ArrayUtils.subarray(displayPathElements, 5, displayPathElements.length); Object[] subPath = ArrayUtils.subarray(displayPathElements, 5, displayPathElements.length);
StringBuffer originatingLocationPath = new StringBuffer(); StringBuffer originatingLocationPath = new StringBuffer();
@@ -305,6 +305,23 @@ public class JSONConversionComponent extends org.alfresco.repo.jscript.app.JSONC
rootJSONObject.put("originatingLocationPath", originatingLocationPath.toString()); rootJSONObject.put("originatingLocationPath", originatingLocationPath.toString());
} }
} }
/**
* Helper method to get the display path.
*
* @param nodeRef node reference
* @return String display path
*/
private String getDisplayPath(final NodeRef nodeRef)
{
return AuthenticationUtil.runAs(new RunAsWork<String>()
{
public String doWork() throws Exception
{
return PathUtil.getDisplayPath(nodeService.getPath(nodeRef), true);
}
}, AuthenticationUtil.getAdminUserName());
}
/** /**
* @param nodeRef * @param nodeRef