X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2FSuiteApp.java;fp=org.argeo.app.ui%2Fsrc%2Forg%2Fargeo%2Fapp%2Fui%2FSuiteApp.java;h=a8b9b2e26901c966a4ead4d6b8b4b3ed026516ba;hb=c3e27ffcb6336ad32ead985306b25e4971fef455;hp=ef4aaff9545953eb3530bf09f52a964f00c22f81;hpb=f2d6ceac3fc54f45e825f6f40a741b16c75fa7d3;p=gpl%2Fargeo-suite.git

diff --git a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
index ef4aaff..a8b9b2e 100644
--- a/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
+++ b/org.argeo.app.ui/src/org/argeo/app/ui/SuiteApp.java
@@ -209,6 +209,7 @@ public class SuiteApp extends AbstractCmsApp implements CmsEventSubscriber {
 
 			if (cmsView.isAnonymous() && publicBasePath == null) {// internal app, must login
 				ui.logout();
+				ui.setLoginScreen(true);
 				if (headerUiProvider != null)
 					refreshPart(headerUiProvider, ui.getHeader(), context);
 				ui.refreshBelowHeader(false);
@@ -220,6 +221,12 @@ public class SuiteApp extends AbstractCmsApp implements CmsEventSubscriber {
 			} else {
 				if (LOGIN.equals(state))
 					state = null;
+				if (ui.isLoginScreen()) {
+//					if (state == null)
+//						state = ui.getPostLoginState();
+					ui.setLoginScreen(false);
+//					ui.setPostLoginState(null);
+				}
 				CmsSession cmsSession = cmsView.getCmsSession();
 				if (ui.getUserDirNode() == null) {
 					// FIXME NPE on CMSSession when logging in from anonymous
@@ -423,6 +430,11 @@ public class SuiteApp extends AbstractCmsApp implements CmsEventSubscriber {
 			return;
 		}
 		SuiteUi suiteUi = (SuiteUi) cmsUi;
+		if (suiteUi.isLoginScreen()) {
+//			suiteUi.setPostLoginState(state);
+			return;
+		}
+
 		Content node = stateToNode(suiteUi, state);
 		if (node == null) {
 			suiteUi.getCmsView().navigateTo(HOME_STATE);
@@ -551,7 +563,7 @@ public class SuiteApp extends AbstractCmsApp implements CmsEventSubscriber {
 					}
 				}
 			} catch (Exception e) {
-				CmsFeedback.error("Cannot handle event " + event, e);
+				CmsFeedback.error("Cannot handle event " + topic + " " + event, e);
 //				log.error("Cannot handle event " + event, e);
 			}
 		});