Merged 5.2.N (5.2.1) to HEAD (5.2)

129197 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
      129054 adavis: REPO-232,REPO-883 V1 REST API: Sites Live Search (/queries/live-search-sites)
         - Moved getSite() into the class that uses it.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129371 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2016-08-09 14:17:13 +00:00
parent 87f28f265b
commit b127bd5178

View File

@@ -367,9 +367,6 @@ public class QueriesImpl implements Queries, InitializingBean
return getSite(siteService.getSite(nodeRef), true);
}
}.find(parameters, PARAM_TERM, MIN_TERM_LENGTH_SITES, "_SITE", sortType, SITE_SORT_PARAMS_TO_QNAMES, new SortColumn(PARAM_SITE_TITLE, true));
}
// note: see also Sites.getSite
private Site getSite(SiteInfo siteInfo, boolean includeRole)
{
@@ -382,6 +379,8 @@ public class QueriesImpl implements Queries, InitializingBean
}
return new Site(siteInfo, role);
}
}.find(parameters, PARAM_TERM, MIN_TERM_LENGTH_SITES, "_SITE", sortType, SITE_SORT_PARAMS_TO_QNAMES, new SortColumn(PARAM_SITE_TITLE, true));
}
public abstract static class AbstractQuery<T>
{