LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
master
jensp 2013-08-01 11:05:23 +00:00
parent 8bbcac1977
commit 4064358881
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ccm-core/src/com/arsdigita/ui/admin/applications/MultiInstanceApplicationPane.java
View File

@ -49,9 +49,9 @@ public class MultiInstanceApplicationPane<T extends Application> extends BaseApp
public MultiInstanceApplicationPane(final ApplicationType applicationType, final Form createForm) { public MultiInstanceApplicationPane(final ApplicationType applicationType, final Form createForm) {
super(applicationType); super(applicationType);
final ApplicationCollection applications = Application.retrieveAllApplications(applicationType. //final ApplicationCollection applications = Application.retrieveAllApplications(applicationType.
getApplicationObjectType()); // getApplicationObjectType());
applications.rewind(); //applications.rewind();
final Table table = new Table(); final Table table = new Table();
table.getColumnModel().add(new TableColumn(COL_TITLE, table.getColumnModel().add(new TableColumn(COL_TITLE,
new Label(GlobalizationUtil.globalize( new Label(GlobalizationUtil.globalize(
@ -63,7 +63,8 @@ public class MultiInstanceApplicationPane<T extends Application> extends BaseApp
new Label(GlobalizationUtil.globalize( new Label(GlobalizationUtil.globalize(
"ui.admin.applicationsMultiInstanceApplicationPane.instances.table.col_desc.header")))); "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( addSegment(new Label(GlobalizationUtil.globalize(
"ui.admin.MultiInstanceApplicationPane.instances")), "ui.admin.MultiInstanceApplicationPane.instances")),
@ -93,6 +94,12 @@ public class MultiInstanceApplicationPane<T extends Application> extends BaseApp
this.applications = applications; this.applications = applications;
} }
public ApplicationInstancesTableModelBuilder(final String appType) {
super();
this.applications = Application.retrieveAllApplications(appType);
}
public TableModel makeModel(final Table table, final PageState state) { public TableModel makeModel(final Table table, final PageState state) {
return new ApplicationInstancesTableModel(table, applications); return new ApplicationInstancesTableModel(table, applications);
} }