inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V2.2 to HEAD

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/web/bean/groups/AddUsersDialog.java
View File

@@ -171,7 +171,11 @@ public class AddUsersDialog extends BaseDialogBean
this.usersDataModel = new ListDataModel(); this.usersDataModel = new ListDataModel();
} }
this.usersDataModel.setWrappedData(this.usersForGroup); // only set the wrapped data once otherwise the rowindex is reset
if (this.usersDataModel.getWrappedData() == null)
{
this.usersDataModel.setWrappedData(this.usersForGroup);
}
return this.usersDataModel; return this.usersDataModel;
} }

6
source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java
View File

@@ -154,7 +154,11 @@ public class AdvancedSearchDialog extends BaseDialogBean
*/ */
public DataModel getCategoriesDataModel() 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(); return properties.getCategoriesDataModel();
} }

5
source/java/org/alfresco/web/bean/users/UserMembersBean.java
View File

@@ -258,7 +258,10 @@ public abstract class UserMembersBean extends BaseDialogBean implements IContext
this.personRolesDataModel = new ListDataModel(); this.personRolesDataModel = new ListDataModel();
} }
this.personRolesDataModel.setWrappedData(this.personRoles); if (this.personRolesDataModel.getWrappedData() == null)
{
this.personRolesDataModel.setWrappedData(this.personRoles);
}
return this.personRolesDataModel; return this.personRolesDataModel;
} }

6
source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java
View File

@@ -733,7 +733,11 @@ public class CreateFormWizard extends BaseWizardBean
this.renderingEngineTemplatesDataModel = new ListDataModel(); this.renderingEngineTemplatesDataModel = new ListDataModel();
} }
this.renderingEngineTemplatesDataModel.setWrappedData(this.renderingEngineTemplates); // only set the wrapped data once otherwise the rowindex is reset
if (this.renderingEngineTemplatesDataModel.getWrappedData() == null)
{
this.renderingEngineTemplatesDataModel.setWrappedData(this.renderingEngineTemplates);
}
return this.renderingEngineTemplatesDataModel; return this.renderingEngineTemplatesDataModel;
} }

6
source/java/org/alfresco/web/bean/wcm/FormTemplatesDialog.java
View File

@@ -137,7 +137,11 @@ public class FormTemplatesDialog extends BaseDialogBean
this.templatesDataModel = new ListDataModel(); this.templatesDataModel = new ListDataModel();
} }
this.templatesDataModel.setWrappedData(this.templates); // only set the wrapped data once otherwise the rowindex is reset
if (this.templatesDataModel.getWrappedData() == null)
{
this.templatesDataModel.setWrappedData(this.templates);
}
return this.templatesDataModel; return this.templatesDataModel;
} }

3
source/java/org/alfresco/web/bean/wcm/SubmitDialog.java
View File

@@ -475,7 +475,6 @@ public class SubmitDialog extends BaseDialogBean
final String sandboxPath = AVMUtil.buildSandboxRootPath(this.avmBrowseBean.getSandbox()); final String sandboxPath = AVMUtil.buildSandboxRootPath(this.avmBrowseBean.getSandbox());
final String stagingPath = AVMUtil.buildSandboxRootPath(this.avmBrowseBean.getStagingStore()); final String stagingPath = AVMUtil.buildSandboxRootPath(this.avmBrowseBean.getStagingStore());
final List<AVMDifference> diffs = new ArrayList<AVMDifference>(items.size()); final List<AVMDifference> diffs = new ArrayList<AVMDifference>(items.size());
final AVMSyncService syncService = this.getAvmSyncService();
final String submitLabel = this.label; final String submitLabel = this.label;
final String submitComment = this.comment; final String submitComment = this.comment;
@@ -511,7 +510,7 @@ public class SubmitDialog extends BaseDialogBean
{ {
public Object doWork() throws Exception public Object doWork() throws Exception
{ {
syncService.update(diffs, null, true, true, false, false, submitLabel, submitComment); getAvmSyncService().update(diffs, null, true, true, false, false, submitLabel, submitComment);
AVMDAOs.Instance().fAVMNodeDAO.flush(); AVMDAOs.Instance().fAVMNodeDAO.flush();
getAvmSyncService().flatten(sandboxPath, stagingPath); getAvmSyncService().flatten(sandboxPath, stagingPath);
return null; return null;

6
source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java
View File

@@ -314,7 +314,11 @@ public abstract class BaseInviteUsersWizard extends BaseWizardBean
this.userRolesDataModel = new ListDataModel(); this.userRolesDataModel = new ListDataModel();
} }
this.userRolesDataModel.setWrappedData(this.userGroupRoles); // only set the wrapped data once otherwise the rowindex is reset
if (this.userRolesDataModel.getWrappedData() == null)
{
this.userRolesDataModel.setWrappedData(this.userGroupRoles);
}
return this.userRolesDataModel; return this.userRolesDataModel;
} }