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

Fix for error shown if empty search string used in Add User to Group dialog in Explorer.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19399 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Kevin Roast
2010-03-19 14:40:05 +00:00
parent 68a778ed9b
commit 7b4b6d3537
1 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
source/java/org/alfresco/web/bean/groups/AddUsersDialog.java
View File

@@ -201,41 +201,44 @@ public class AddUsersDialog extends BaseDialogBean
{
public SelectItem[] execute() throws Exception
{
SelectItem[] items;
SelectItem[] items = new SelectItem[0];
// Use lucene search to retrieve user details
String term = LuceneQueryParser.escape(contains.trim());
StringBuilder query = new StringBuilder(128);
Utils.generatePersonSearch(query, term);
List<NodeRef> nodes;
ResultSet resultSet = Repository.getServiceRegistry(context).getSearchService().query(
Repository.getStoreRef(),
SearchService.LANGUAGE_LUCENE,
query.toString());
try
if (term.length() != 0)
{
nodes = resultSet.getNodeRefs();
StringBuilder query = new StringBuilder(128);
Utils.generatePersonSearch(query, term);
List<NodeRef> nodes;
ResultSet resultSet = Repository.getServiceRegistry(context).getSearchService().query(
Repository.getStoreRef(),
SearchService.LANGUAGE_LUCENE,
query.toString());
try
{
nodes = resultSet.getNodeRefs();
}
finally
{
resultSet.close();
}
ArrayList<SelectItem> itemList = new ArrayList<SelectItem>(nodes.size());
for (NodeRef personRef : nodes)
{
String username = (String)getNodeService().getProperty(personRef, ContentModel.PROP_USERNAME);
if (AuthenticationUtil.getGuestUserName().equals(username) == false)
{
String firstName = (String)getNodeService().getProperty(personRef, ContentModel.PROP_FIRSTNAME);
String lastName = (String)getNodeService().getProperty(personRef, ContentModel.PROP_LASTNAME);
SelectItem item = new SortableSelectItem(username, firstName + " " + lastName + " [" + username + "]", lastName);
itemList.add(item);
}
}
items = new SelectItem[itemList.size()];
itemList.toArray(items);
}
finally
{
resultSet.close();
}
ArrayList<SelectItem> itemList = new ArrayList<SelectItem>(nodes.size());
for (NodeRef personRef : nodes)
{
String username = (String)getNodeService().getProperty(personRef, ContentModel.PROP_USERNAME);
if (AuthenticationUtil.getGuestUserName().equals(username) == false)
{
String firstName = (String)getNodeService().getProperty(personRef, ContentModel.PROP_FIRSTNAME);
String lastName = (String)getNodeService().getProperty(personRef, ContentModel.PROP_LASTNAME);
SelectItem item = new SortableSelectItem(username, firstName + " " + lastName + " [" + username + "]", lastName);
itemList.add(item);
}
}
items = new SelectItem[itemList.size()];
itemList.toArray(items);
return items;
}
});