From 406435888112e2dcf889ef3c4ff512e330aa3675 Mon Sep 17 00:00:00 2001 From: jensp Date: Thu, 1 Aug 2013 11:05:23 +0000 Subject: [PATCH] Some more modifications to avoid transactions/thread problems in the ApplicationsTab in /ccm/admin. git-svn-id: https://svn.libreccm.org/ccm/trunk@2283 8810af33-2d31-482b-a856-94f89814c4df --- .../MultiInstanceApplicationPane.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/ccm-core/src/com/arsdigita/ui/admin/applications/MultiInstanceApplicationPane.java b/ccm-core/src/com/arsdigita/ui/admin/applications/MultiInstanceApplicationPane.java index a53459aec..86e85163f 100644 --- a/ccm-core/src/com/arsdigita/ui/admin/applications/MultiInstanceApplicationPane.java +++ b/ccm-core/src/com/arsdigita/ui/admin/applications/MultiInstanceApplicationPane.java @@ -49,9 +49,9 @@ public class MultiInstanceApplicationPane extends BaseApp public MultiInstanceApplicationPane(final ApplicationType applicationType, final Form createForm) { super(applicationType); - final ApplicationCollection applications = Application.retrieveAllApplications(applicationType. - getApplicationObjectType()); - applications.rewind(); + //final ApplicationCollection applications = Application.retrieveAllApplications(applicationType. + // getApplicationObjectType()); + //applications.rewind(); final Table table = new Table(); table.getColumnModel().add(new TableColumn(COL_TITLE, new Label(GlobalizationUtil.globalize( @@ -63,7 +63,8 @@ public class MultiInstanceApplicationPane extends BaseApp new Label(GlobalizationUtil.globalize( "ui.admin.applicationsMultiInstanceApplicationPane.instances.table.col_desc.header")))); - table.setModelBuilder(new ApplicationInstancesTableModelBuilder(applications)); + //table.setModelBuilder(new ApplicationInstancesTableModelBuilder(applications)); + table.setModelBuilder(new ApplicationInstancesTableModelBuilder(applicationType.getApplicationObjectType())); addSegment(new Label(GlobalizationUtil.globalize( "ui.admin.MultiInstanceApplicationPane.instances")), @@ -92,6 +93,12 @@ public class MultiInstanceApplicationPane extends BaseApp this.applications = applications; } + + public ApplicationInstancesTableModelBuilder(final String appType) { + super(); + + this.applications = Application.retrieveAllApplications(appType); + } public TableModel makeModel(final Table table, final PageState state) { return new ApplicationInstancesTableModel(table, applications);