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

PL-10384 Default screen is not opened in case of extended main window with side menu

Browse Source
This commit is contained in:
Daniil Tsarev 2018-02-13 11:19:54 +04:00
parent 16b9650054
commit d5a51eaaa2
5 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2053,6 +2053,11 @@ public class DesktopWindowManager extends WindowManager {
return false;
}
// just stub
@Override
public void openDefaultScreen() {
}
protected class DesktopNotificationAction implements Action {
private Type type;

7
modules/gui/src/com/haulmont/cuba/gui/WindowManager.java
View File

@ -1265,6 +1265,13 @@ public abstract class WindowManager {
}
}
/**
* Opens default screen. Implemented only for the web module.
* <p>
* Default screen can be defined with the {@code cuba.web.defaultScreenId} application property.
*/
public abstract void openDefaultScreen();
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/**

7
modules/gui/src/com/haulmont/cuba/gui/components/AbstractMainWindow.java
View File

@ -107,4 +107,11 @@ public class AbstractMainWindow extends AbstractTopLevelWindow implements Window
userIndicator.refreshUserSubstitutions();
}
}
@Override
public void ready() {
super.ready();
getWindowManager().openDefaultScreen();
}
}

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

@ -1769,7 +1769,8 @@ public class WebWindowManager extends WindowManager {
return !window.getId().equals(defaultScreenId);
}
public void openDefaultWindow() {
@Override
public void openDefaultScreen() {
String defaultScreenId = webConfig.getDefaultScreenId();
if (webConfig.getUserCanChooseDefaultScreen()) {

8
modules/web/src/com/haulmont/cuba/web/app/mainwindow/AppMainWindow.java
View File

@ -22,7 +22,6 @@ import com.haulmont.cuba.gui.components.mainwindow.AppMenu;
import com.haulmont.cuba.gui.components.mainwindow.AppWorkArea;
import com.haulmont.cuba.gui.components.mainwindow.FoldersPane;
import com.haulmont.cuba.gui.components.mainwindow.FtsField;
import com.haulmont.cuba.web.App;
import com.haulmont.cuba.web.WebConfig;
import com.haulmont.cuba.web.gui.components.WebComponentsHelper;
import com.haulmont.cuba.web.toolkit.ui.CubaHorizontalSplitPanel;
@ -96,11 +95,4 @@ public class AppMainWindow extends AbstractMainWindow {
expand(workArea);
}
}
@Override
public void ready() {
super.ready();
App.getInstance().getWindowManager().openDefaultWindow();
}
}