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

Application Pane BugFix 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2274 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2013-07-26 13:59:07 +00:00
parent c5306b93b1
commit a4cd0245ef
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ccm-core/src/com/arsdigita/ui/admin/applications/ApplicationInstancePane.java
View File

@ -21,6 +21,7 @@ package com.arsdigita.ui.admin.applications;
import com.arsdigita.bebop.Label; import com.arsdigita.bebop.Label;
import com.arsdigita.bebop.PropertySheet; import com.arsdigita.bebop.PropertySheet;
import com.arsdigita.bebop.SegmentedPanel; import com.arsdigita.bebop.SegmentedPanel;
import com.arsdigita.persistence.SessionManager;
import com.arsdigita.ui.admin.GlobalizationUtil; import com.arsdigita.ui.admin.GlobalizationUtil;
import com.arsdigita.web.Application; import com.arsdigita.web.Application;
@ -37,7 +38,7 @@ public class ApplicationInstancePane extends SegmentedPanel {
public ApplicationInstancePane(final Application appInstance, final ApplicationInstanceAwareContainer appAdminPane) { public ApplicationInstancePane(final Application appInstance, final ApplicationInstanceAwareContainer appAdminPane) {
super(); super();
final PropertySheet appInstInfoPanel = new PropertySheet(new ApplicationInstancePropertySheetModelBuilder( final PropertySheet appInstInfoPanel = new PropertySheet(new ApplicationInstancePropertySheetModelBuilder(
appInstance)); appInstance));
@ -57,6 +58,10 @@ public class ApplicationInstancePane extends SegmentedPanel {
"ui.admin.applications.ApplicationInstancePane.manage.heading")), "ui.admin.applications.ApplicationInstancePane.manage.heading")),
appAdminPane); appAdminPane);
} }
if (SessionManager.getSession().getTransactionContext().inTxn()) {
SessionManager.getSession().getTransactionContext().commitTxn();
}
} }
} }

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

@ -25,6 +25,7 @@ import com.arsdigita.bebop.Table;
import com.arsdigita.bebop.table.TableColumn; import com.arsdigita.bebop.table.TableColumn;
import com.arsdigita.bebop.table.TableModel; import com.arsdigita.bebop.table.TableModel;
import com.arsdigita.bebop.table.TableModelBuilder; import com.arsdigita.bebop.table.TableModelBuilder;
import com.arsdigita.persistence.SessionManager;
import com.arsdigita.ui.admin.GlobalizationUtil; import com.arsdigita.ui.admin.GlobalizationUtil;
import com.arsdigita.util.LockableImpl; import com.arsdigita.util.LockableImpl;
import com.arsdigita.web.Application; import com.arsdigita.web.Application;
@ -133,6 +134,9 @@ public class MultiInstanceApplicationPane<T extends Application> extends BaseApp
} }
public Object getKeyAt(final int columnIndex) { public Object getKeyAt(final int columnIndex) {
if (SessionManager.getSession().getTransactionContext().inTxn()) {
SessionManager.getSession().getTransactionContext().commitTxn();
}
return applications.getApplication().getPath(); return applications.getApplication().getPath();
} }