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

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<UserAuthorityDetails>();
    }
 

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<Node>(2));
+      properties.setCategoriesDataModel(null);
       properties.setTitle(null);
       properties.setDescription(null);
       properties.setAuthor(null);

source/java/org/alfresco/web/bean/search/SearchProperties.java

@@ -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()
     {

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);
          }

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<RenderingEngineTemplateData>();
+      this.renderingEngineTemplatesDataModel = null;
       this.outputPathPatternForFormInstanceData = null;
       this.outputPathPatternForRendition = null;
       this.mimetypeForRendition = null;

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<UserGroupRole>(8);
       mailHelper = new TemplateMailHelperBean();
       mailHelper.setMailSender(mailSender);