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 'remotes/origin/master' into feature/RM-6796_DeclareAndFileTests

Browse Source
This commit is contained in:
cagache
2019-05-06 16:59:12 +03:00
parent 7ed0e9f15c e19e3c8b35
commit d247e1e2bc
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java
View File

@@ -77,6 +77,7 @@ public class RMSearchGet extends DeclarativeWebScript
private static final String PARAM_SORTBY = "sortby"; private static final String PARAM_SORTBY = "sortby";
private static final String PARAM_FILTERS = "filters"; private static final String PARAM_FILTERS = "filters";
private static final String PARAM_MAX_ITEMS = "maxitems"; private static final String PARAM_MAX_ITEMS = "maxitems";
private static final String SYSTEM = "System";
/** Records management search service */ /** Records management search service */
protected RecordsManagementSearchService recordsManagementSearchService; protected RecordsManagementSearchService recordsManagementSearchService;
@@ -373,6 +374,12 @@ public class RMSearchGet extends DeclarativeWebScript
private String getDisplayName(String userName) private String getDisplayName(String userName)
{ {
//Fix for RM-6834
if(userName.equals(SYSTEM))
{
return SYSTEM;
}
String result = personDataCache.get(userName); String result = personDataCache.get(userName);
if (result == null) if (result == null)
{ {