From 3e8c994816a9a47467c7712cf48d3d4ab94d92b4 Mon Sep 17 00:00:00 2001 From: Gavin Cornwell Date: Tue, 11 Mar 2008 14:55:29 +0000 Subject: [PATCH] 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 --- .../java/org/alfresco/web/bean/groups/AddUsersDialog.java | 6 +++++- .../org/alfresco/web/bean/search/AdvancedSearchDialog.java | 6 +++++- .../java/org/alfresco/web/bean/users/UserMembersBean.java | 5 ++++- source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java | 6 +++++- .../java/org/alfresco/web/bean/wcm/FormTemplatesDialog.java | 6 +++++- source/java/org/alfresco/web/bean/wcm/SubmitDialog.java | 3 +-- .../org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java | 6 +++++- 7 files changed, 30 insertions(+), 8 deletions(-) diff --git a/source/java/org/alfresco/web/bean/groups/AddUsersDialog.java b/source/java/org/alfresco/web/bean/groups/AddUsersDialog.java index ca57f356c8..815af853d7 100644 --- a/source/java/org/alfresco/web/bean/groups/AddUsersDialog.java +++ b/source/java/org/alfresco/web/bean/groups/AddUsersDialog.java @@ -171,7 +171,11 @@ public class AddUsersDialog extends BaseDialogBean 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; } diff --git a/source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java b/source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java index d15774c6b9..7bb688d95f 100644 --- a/source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java +++ b/source/java/org/alfresco/web/bean/search/AdvancedSearchDialog.java @@ -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(); } diff --git a/source/java/org/alfresco/web/bean/users/UserMembersBean.java b/source/java/org/alfresco/web/bean/users/UserMembersBean.java index a25c30af18..b27b5b264b 100644 --- a/source/java/org/alfresco/web/bean/users/UserMembersBean.java +++ b/source/java/org/alfresco/web/bean/users/UserMembersBean.java @@ -258,7 +258,10 @@ public abstract class UserMembersBean extends BaseDialogBean implements IContext this.personRolesDataModel = new ListDataModel(); } - this.personRolesDataModel.setWrappedData(this.personRoles); + if (this.personRolesDataModel.getWrappedData() == null) + { + this.personRolesDataModel.setWrappedData(this.personRoles); + } return this.personRolesDataModel; } diff --git a/source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java b/source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java index f9d9696e23..a08995a338 100644 --- a/source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java +++ b/source/java/org/alfresco/web/bean/wcm/CreateFormWizard.java @@ -733,7 +733,11 @@ public class CreateFormWizard extends BaseWizardBean 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; } diff --git a/source/java/org/alfresco/web/bean/wcm/FormTemplatesDialog.java b/source/java/org/alfresco/web/bean/wcm/FormTemplatesDialog.java index 0ea86907f1..131955fd01 100644 --- a/source/java/org/alfresco/web/bean/wcm/FormTemplatesDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/FormTemplatesDialog.java @@ -137,7 +137,11 @@ public class FormTemplatesDialog extends BaseDialogBean 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; } diff --git a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java index 4ed60116e7..59bf47a665 100644 --- a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java @@ -475,7 +475,6 @@ public class SubmitDialog extends BaseDialogBean final String sandboxPath = AVMUtil.buildSandboxRootPath(this.avmBrowseBean.getSandbox()); final String stagingPath = AVMUtil.buildSandboxRootPath(this.avmBrowseBean.getStagingStore()); final List diffs = new ArrayList(items.size()); - final AVMSyncService syncService = this.getAvmSyncService(); final String submitLabel = this.label; final String submitComment = this.comment; @@ -511,7 +510,7 @@ public class SubmitDialog extends BaseDialogBean { 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(); getAvmSyncService().flatten(sandboxPath, stagingPath); return null; diff --git a/source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java b/source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java index f327dc544b..b4ce5615d7 100644 --- a/source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java +++ b/source/java/org/alfresco/web/bean/wizard/BaseInviteUsersWizard.java @@ -314,7 +314,11 @@ public abstract class BaseInviteUsersWizard extends BaseWizardBean 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; }