From d14f28a0a957be711ef791bafdf14e47e24044eb Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Mon, 21 Mar 2016 11:05:59 +0000 Subject: [PATCH] Merged 5.1.N (5.1.2) to 5.2.N (5.2.1) 124236 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2) (PARTIAL MERGE) 124190 amorarasu: Merged V4.2-BUG-FIX (4.2.7) to 5.0.N (5.0.4) 124132 arebegea: MNT-15573 : Site finder slow for a user who's member of many sites - added a new method to InvitationService to make use of the limit in the searchInvitation - sent and used the 200 limit from the site-finder.get.js in the script/ScriptInvitationService.java and passed the new parameter - for searchModeratedInvitations and searchNominatedInvitations methods of InvitationServiceImpl.java I added the use of the limit parameter - added some comments on ActivitiWorkflowEngine.java and TaskComponent.java to inform developers about the performance issues and possible improvement - added junit tests git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@124277 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repository/invitation/invitations.get.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/invitation/invitations.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/invitation/invitations.get.js index f45da443ec..c94d4e598e 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/invitation/invitations.get.js +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/invitation/invitations.get.js @@ -12,6 +12,7 @@ function main() var invitationType = args["invitationType"]; var resourceType = args["resourceType"]; var resourceName = args["resourceName"]; + var resultsLimit = args["resultsLimit"]; var props = {}; @@ -31,6 +32,10 @@ function main() { props.resourceName = resourceName } + if (resultsLimit != null) + { + props.resultsLimit = resultsLimit + } var invites = invitations.listInvitations(props);