Merged V2.1-A to HEAD

8403: Fix for ADB-33
  8586: Fix for ADB-33

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2008-05-21 09:05:00 +00:00
parent a4937fd9ae
commit c5220e3a96
7 changed files with 137 additions and 5 deletions

View File

@@ -54,6 +54,7 @@ import org.alfresco.web.bean.repository.Repository;
import org.alfresco.web.ui.common.SortableSelectItem;
import org.alfresco.web.ui.common.Utils;
import org.alfresco.web.ui.common.component.UIGenericPicker;
import org.apache.lucene.search.BooleanQuery;
/**
* Implementation of the add user dialog.
@@ -244,6 +245,15 @@ public class AddUsersDialog extends BaseDialogBean
}
});
}
catch (BooleanQuery.TooManyClauses clauses)
{
Utils.addErrorMessage(Application.getMessage(
FacesContext.getCurrentInstance(), "too_many_users"));
try { if (tx != null) {tx.rollback();} } catch (Exception tex) {}
return new SelectItem[0];
}
catch (Exception err)
{
Utils.addErrorMessage(MessageFormat.format(Application.getMessage(