projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix Javadoc issue
[gpl/argeo-suite.git]
/
org.argeo.app.ui
/
src
/
org
/
argeo
/
app
/
ui
/
SuiteApp.java
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 ef4aaff9545953eb3530bf09f52a964f00c22f81..a8b9b2e26901c966a4ead4d6b8b4b3ed026516ba 100644
(file)
--- 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();
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);
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;
} 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
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;
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);
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) {
}
}
} 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);
}
});
// log.error("Cannot handle event " + event, e);
}
});