Merged 2.2 to HEAD

8729: Fix for AWC-1957 & AWC-1962 (Administrator is unable to add any user to "Selected users/groups and their role(s)" list)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8777 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2008-04-15 13:28:37 +00:00
parent 66660954cf
commit bd0c9200a1
6 changed files with 16 additions and 1 deletions

View File

@@ -103,7 +103,7 @@ public class SearchProperties implements Serializable
private List<Node> categories = new ArrayList<Node>(2);
/** datamodel for table of categories to search */
transient private DataModel categoriesDataModel = new ListDataModel();
transient private DataModel categoriesDataModel = null;
/** title attribute to search */
private String title = null;
@@ -326,8 +326,18 @@ public class SearchProperties implements Serializable
public DataModel getCategoriesDataModel()
{
if (categoriesDataModel == null)
{
categoriesDataModel = new ListDataModel();
}
return categoriesDataModel;
}
public void setCategoriesDataModel(DataModel categoriesDataModel)
{
this.categoriesDataModel = categoriesDataModel;
}
public String getTitle()
{