test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-02 19:27:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

WindowManager checkModificationsAndCloseAll does not support Window.Committable #854

Browse Source
This commit is contained in:
Yuriy Artamonov 2018-05-18 12:24:02 +04:00
parent efb033b531
commit 264edb8f6f
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/desktop/src/com/haulmont/cuba/desktop/sys/DesktopWindowManager.java
View File

@ -1878,7 +1878,7 @@ public class DesktopWindowManager extends WindowManager {
addShortcuts(window, openType);
}
public void checkModificationsAndCloseAll(final Runnable runIfOk, final @Nullable Runnable runIfCancel) {
public void checkModificationsAndCloseAll(Runnable runIfOk, @Nullable Runnable runIfCancel) {
boolean modified = false;
for (Window window : getOpenWindows()) {
if (!disableSavingScreenHistory) {
@ -1896,7 +1896,12 @@ public class DesktopWindowManager extends WindowManager {
recursiveFramesClose = false;
}
if (window.getDsContext() != null && window.getDsContext().isModified()) {
if (window instanceof WrappedWindow
&& ((WrappedWindow) window).getWrapper() instanceof Window.Committable) {
WrappedWindow wrappedWindow = (WrappedWindow) window;
modified = ((Window.Committable) wrappedWindow.getWrapper()).isModified();
} else if (window.getDsContext() != null
&& window.getDsContext().isModified()) {
modified = true;
}
}

9
modules/web/src/com/haulmont/cuba/web/WebWindowManager.java
View File

@ -898,7 +898,7 @@ public class WebWindowManager extends WindowManager {
* @param runIfOk a closure to run after all screens are closed
* @param runIfCancel a closure to run if there were modifications and a user canceled the operation
*/
public void checkModificationsAndCloseAll(final Runnable runIfOk, final @Nullable Runnable runIfCancel) {
public void checkModificationsAndCloseAll(Runnable runIfOk, @Nullable Runnable runIfCancel) {
boolean modified = false;
for (Window window : getOpenWindows()) {
if (!disableSavingScreenHistory) {
@ -911,7 +911,12 @@ public class WebWindowManager extends WindowManager {
window.saveSettings();
}
if (window.getDsContext() != null && window.getDsContext().isModified()) {
if (window instanceof WrappedWindow
&& ((WrappedWindow) window).getWrapper() instanceof Window.Committable) {
WrappedWindow wrappedWindow = (WrappedWindow) window;
modified = ((Window.Committable) wrappedWindow.getWrapper()).isModified();
} else if (window.getDsContext() != null
&& window.getDsContext().isModified()) {
modified = true;
}
}