From f1d48732b6b144ee9f7c33568cec322da87db577 Mon Sep 17 00:00:00 2001 From: Gethin James Date: Sat, 26 Apr 2014 16:20:13 +0000 Subject: [PATCH] Added a new findSites() method for use by live-search and Site Finder (sites.get.js) for ACE-1513 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68092 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../webscripts/org/alfresco/repository/site/sites.get.js | 3 +-- .../org/alfresco/slingshot/search/live-search.lib.js | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.get.js index 60df257cbb..32457b936a 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.get.js +++ b/config/alfresco/templates/webscripts/org/alfresco/repository/site/sites.get.js @@ -5,9 +5,8 @@ function main() var sitePreset = args["spf"]; var sizeString = args["size"]; - if (nameFilter !== null && nameFilter[0] !== '*') nameFilter = "*" + nameFilter; // Get the list of sites - var sites = siteService.getSites(nameFilter, sitePreset, sizeString != null ? parseInt(sizeString) : -1); + var sites = siteService.findSites(nameFilter, sizeString != null ? parseInt(sizeString) : -1); model.sites = sites; model.roles = (args["roles"] !== null ? args["roles"] : "managers"); } diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/search/live-search.lib.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/search/live-search.lib.js index 494fe4ed79..73447424d2 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/search/live-search.lib.js +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/search/live-search.lib.js @@ -259,8 +259,7 @@ function getSiteResults(params) { // Get the list of sites - ensure we use the faster fts based search code path var t = params.term; - if (t[0] !== '*') t = "*" + t; - var sites = siteService.getSites(t, null, params.maxResults); + var sites = siteService.findSites(t, params.maxResults); return buildResults(sites, params); }