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

PL-6897 Remove old license restrictions

Browse Source
This commit is contained in:
Konstantin Krivopustov 2016-03-17 12:57:48 +04:00
parent 489a0ce392
commit ad92a5a5b7
2 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/desktop/src/com/haulmont/cuba/desktop/App.java
View File

@ -33,13 +33,11 @@ import com.haulmont.cuba.desktop.theme.DesktopThemeLoader;
import com.haulmont.cuba.gui.AppConfig;
import com.haulmont.cuba.gui.TestIdManager;
import com.haulmont.cuba.gui.WindowManager;
import com.haulmont.cuba.gui.components.Frame;
import com.haulmont.cuba.gui.components.Window;
import com.haulmont.cuba.gui.config.WindowConfig;
import com.haulmont.cuba.gui.config.WindowInfo;
import com.haulmont.cuba.gui.theme.ThemeConstants;
import com.haulmont.cuba.gui.theme.ThemeConstantsRepository;
import com.haulmont.cuba.security.app.UserSessionService;
import com.haulmont.cuba.security.entity.User;
import com.haulmont.cuba.security.global.LoginException;
import com.haulmont.cuba.security.global.UserSession;
@ -633,7 +631,6 @@ public class App implements ConnectionListener {
SwingUtilities.invokeLater(new Runnable() {
@Override
public void run() {
checkSessions();
afterLoggedIn();
}
});
@ -672,22 +669,6 @@ public class App implements ConnectionListener {
return applicationSession;
}
private void checkSessions() {
UserSessionService userSessionService = AppBeans.get(UserSessionService.NAME);
Map<String, Object> info = userSessionService.getLicenseInfo();
Integer licensed = (Integer) info.get("licensedSessions");
if (licensed < 0) {
mainFrame.showNotification("Invalid CUBA platform license. See server log for details.",
Frame.NotificationType.ERROR);
} else {
Integer active = (Integer) info.get("activeSessions");
if (licensed != 0 && active > licensed) {
mainFrame.showNotification("Number of licensed sessions exceeded", "active: " + active + ", licensed: " + licensed,
Frame.NotificationType.ERROR);
}
}
}
/**
* Perform actions after success login
*/

4
modules/gui/src/com/haulmont/cuba/gui/app/core/credits/CreditsFrame.java
View File

@ -108,6 +108,8 @@ public class CreditsFrame extends AbstractFrame {
grid.add(license, 4, i);
}
scrollBox.add(grid);
if (acknowledgements.length() > 0) {
Label ackLab = componentsFactory.createComponent(Label.class);
ackLab.setWidth("420px");
@ -115,8 +117,6 @@ public class CreditsFrame extends AbstractFrame {
ackLab.setValue(acknowledgements.toString());
scrollBox.add(ackLab);
}
scrollBox.add(grid);
}
}