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

ALF-8968 - De-Lucene DeleteUser, Users and AddUsers JSF dialogs, which now use the person service finder

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@28368 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2011-06-13 14:13:37 +00:00
parent 457c4dfb8c
commit 292af56c15
4 changed files with 92 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
source/java/org/alfresco/web/bean/users/UsersDialog.java
View File

@@ -30,11 +30,10 @@ import javax.faces.event.ActionEvent;
import javax.transaction.UserTransaction;
import org.alfresco.model.ContentModel;
import org.alfresco.query.PagingRequest;
import org.alfresco.service.cmr.repository.InvalidNodeRefException;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.search.ResultSet;
import org.alfresco.service.cmr.search.SearchParameters;
import org.alfresco.service.cmr.search.SearchService;
import org.alfresco.service.cmr.security.PagingPersonResults;
import org.alfresco.service.namespace.QName;
import org.alfresco.web.app.Application;
import org.alfresco.web.app.context.IContextListener;
@@ -296,35 +295,23 @@ public class UsersDialog extends BaseDialogBean implements IContextListener, Cha
// define the query to find people by their first or last name
String search = properties.getSearchCriteria();
StringBuilder query = new StringBuilder(128);
Utils.generatePersonSearch(query, search);
if (logger.isDebugEnabled())
logger.debug("Query: " + query.toString());
logger.debug("Query term: " + search);
// define the search parameters
SearchParameters params = new SearchParameters();
params.setLanguage(SearchService.LANGUAGE_LUCENE);
params.addStore(Repository.getStoreRef());
params.setQuery(query.toString());
ResultSet results = properties.getSearchService().query(params);
List<NodeRef> people;
try
{
people = results.getNodeRefs();
}
finally
{
results.close();
}
PagingPersonResults people = properties.getPersonService().getPeople(
Utils.generatePersonFilter(search),
true,
Utils.generatePersonSort(),
new PagingRequest(Utils.getPersonMaxResults(), null)
);
List<NodeRef> nodes = people.getPage();
if (logger.isDebugEnabled())
logger.debug("Found " + people.size() + " users");
logger.debug("Found " + nodes.size() + " users");
this.users = new ArrayList<Node>(people.size());
this.users = new ArrayList<Node>(nodes.size());
for (NodeRef nodeRef : people)
for (NodeRef nodeRef : nodes)
{
// create our Node representation
MapNode node = new MapNode(nodeRef);