Merged V2.2 to HEAD

8357: Fixed code that would break in UI cluster.
  8402: Fix for AWC-1915

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8512 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gavin Cornwell
2008-03-11 14:55:29 +00:00
parent abdf538b63
commit 3e8c994816
7 changed files with 30 additions and 8 deletions

View File

@@ -154,7 +154,11 @@ public class AdvancedSearchDialog extends BaseDialogBean
*/
public DataModel getCategoriesDataModel()
{
properties.getCategoriesDataModel().setWrappedData(properties.getCategories());
// only set the wrapped data once otherwise the rowindex is reset
if (properties.getCategoriesDataModel().getWrappedData() == null)
{
properties.getCategoriesDataModel().setWrappedData(properties.getCategories());
}
return properties.getCategoriesDataModel();
}