inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-24 17:32:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

useCQ restored, Javascrpit changed

Browse Source
This commit is contained in:
mikolajbrzezinski
2022-05-06 15:22:01 +02:00
parent 76d1f1c005
commit 00b79b5aca
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
remote-api/src/main/resources/alfresco/templates/webscripts/org/alfresco/repository/site/membership/potentialmembers.get.js
View File

@@ -3,7 +3,7 @@ function main()
// Get the args // Get the args
var siteShortName = url.templateArgs.shortname, var siteShortName = url.templateArgs.shortname,
site = siteService.getSite(siteShortName), site = siteService.getSite(siteShortName),
filter = (args.filter != null) ? args.filter : (args.shortNameFilter != null) ? args.shortNameFilter : "", filter = (args.filter != null) ? args.filter + " [hint:useCQ]" : (args.shortNameFilter != null) ? args.shortNameFilter : "",
maxResults = (args.maxResults == null) ? 10 : parseInt(args.maxResults, 10), maxResults = (args.maxResults == null) ? 10 : parseInt(args.maxResults, 10),
authorityType = args.authorityType, authorityType = args.authorityType,
zone = args.zone, zone = args.zone,

14
repository/src/main/java/org/alfresco/repo/jscript/People.java
View File

@@ -581,9 +581,17 @@ public class People extends BaseScopableProcessorExtension implements Initializi
protected List<PersonInfo> getPeopleImpl(String filter, ScriptPagingDetails pagingRequest, String sortBy, Boolean sortAsc) protected List<PersonInfo> getPeopleImpl(String filter, ScriptPagingDetails pagingRequest, String sortBy, Boolean sortAsc)
{ {
ParameterCheck.mandatory("pagingRequest", pagingRequest); ParameterCheck.mandatory("pagingRequest", pagingRequest);
boolean useCQ = honorHintUseCQ; boolean useCQ = false;
if (filter == null) if (filter != null)
{
if (filter.endsWith(HINT_CQ_SUFFIX))
{
useCQ = honorHintUseCQ;
filter = filter.substring(0, filter.length()-HINT_CQ_SUFFIX.length());
}
}
else
{ {
filter = "*"; filter = "*";
} }