diff --git a/source/java/org/alfresco/web/bean/groups/AddUsersDialog.java b/source/java/org/alfresco/web/bean/groups/AddUsersDialog.java index 815af853d7..3f44d13551 100644 --- a/source/java/org/alfresco/web/bean/groups/AddUsersDialog.java +++ b/source/java/org/alfresco/web/bean/groups/AddUsersDialog.java @@ -95,6 +95,7 @@ public class AddUsersDialog extends BaseDialogBean this.group = parameters.get(GroupsDialog.PARAM_GROUP); this.groupName = parameters.get(GroupsDialog.PARAM_GROUP_NAME); + this.usersDataModel = null; usersForGroup = new ArrayList(); } diff --git a/source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java b/source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java index 7bb688d95f..d28f7b6427 100644 --- a/source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java +++ b/source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java @@ -312,6 +312,7 @@ public class AdvancedSearchDialog extends BaseDialogBean properties.setLocation(null); properties.setLocationChildren(true); properties.setCategories(new ArrayList(2)); + properties.setCategoriesDataModel(null); properties.setTitle(null); properties.setDescription(null); properties.setAuthor(null); diff --git a/source/java/org/alfresco/web/bean/search/SearchProperties.java b/source/java/org/alfresco/web/bean/search/SearchProperties.java index cc85a25ebb..88b4a2ce03 100644 --- a/source/java/org/alfresco/web/bean/search/SearchProperties.java +++ b/source/java/org/alfresco/web/bean/search/SearchProperties.java @@ -103,7 +103,7 @@ public class SearchProperties implements Serializable private List categories = new ArrayList(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() { diff --git a/source/java/org/alfresco/web/bean/users/UserMembersBean.java b/source/java/org/alfresco/web/bean/users/UserMembersBean.java index b27b5b264b..07a3dc87bb 100644 --- a/source/java/org/alfresco/web/bean/users/UserMembersBean.java +++ b/source/java/org/alfresco/web/bean/users/UserMembersBean.java @@ -567,6 +567,7 @@ public abstract class UserMembersBean extends BaseDialogBean implements IContext } } // action context setup + this.personRolesDataModel = null; this.personRoles = userPermissions; setPersonAuthority(authority); } diff --git a/source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java index a08995a338..f426be4ba2 100644 --- a/source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java +++ b/source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java @@ -400,6 +400,7 @@ public class CreateFormWizard extends BaseWizardBean this.renderingEngineTemplateDescription = null; this.renderingEngine = null; this.renderingEngineTemplates = new ArrayList(); + this.renderingEngineTemplatesDataModel = null; this.outputPathPatternForFormInstanceData = null; this.outputPathPatternForRendition = null; this.mimetypeForRendition = null; diff --git a/source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java b/source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java index b4ce5615d7..3a0b6f8438 100644 --- a/source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java +++ b/source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java @@ -209,6 +209,7 @@ public abstract class BaseInviteUsersWizard extends BaseWizardBean super.init(parameters); notify = NOTIFY_NO; + userRolesDataModel = null; userGroupRoles = new ArrayList(8); mailHelper = new TemplateMailHelperBean(); mailHelper.setMailSender(mailSender);