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);
} 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
setState(ui, state != null ? state : defaultLayerPid);
}
} catch (Exception e) {
- CmsFeedback.show("Unexpected exception", e);
+ CmsFeedback.error("Unexpected exception", e);
}
}
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);
}
}
} catch (Exception e) {
- CmsFeedback.show("Cannot handle event " + event, e);
+ CmsFeedback.error("Cannot handle event " + topic + " " + event, e);
// log.error("Cannot handle event " + event, e);
}
});
}
if (properties.containsKey(EntityConstants.TYPE)) {
List<String> types = LangUtils.toStringList(properties.get(EntityConstants.TYPE));
- for (String type : types)
+ for (String type : types) {
RankedObject.putIfHigherRank(uiProvidersByType, type, uiProvider, properties);
+ }
}
}
}
}
+// public void addLayer(SuiteLayer layer, Map<String, Object> properties) {
+// if (!properties.containsKey(Constants.SERVICE_PID))
+// throw new IllegalArgumentException("A layer must have an ID");
+// String pid = (String) properties.get(Constants.SERVICE_PID);
+// List<String> types = properties.containsKey(EntityConstants.TYPE)
+// ? LangUtils.toStringList(properties.get(EntityConstants.TYPE))
+// : new ArrayList<>();
+// if (types.isEmpty()) {
+// RankedObject.putIfHigherRank(layersByPid, pid, layer, properties);
+// } else {
+// if (layersByPid.containsKey(pid)) {
+// RankedObject<SuiteLayer> current = layersByPid.get(pid);
+// List<String> currentTypes = current.getProperties().containsKey(EntityConstants.TYPE)
+// ? LangUtils.toStringList(current.getProperties().get(EntityConstants.TYPE))
+// : new ArrayList<>();
+// if (!types.containsAll(currentTypes)) {
+// throw new IllegalArgumentException("Higher-ranked layer " + pid + " contains only types " + types
+// + ", while it must override all " + currentTypes);
+// }
+// }
+// RankedObject.putIfHigherRank(layersByPid, pid, layer, properties);
+// for (String type : types)
+// RankedObject.putIfHigherRank(layersByType, type, layer, properties);
+// }
+// }
+
public void addLayer(SuiteLayer layer, Map<String, Object> properties) {
if (properties.containsKey(Constants.SERVICE_PID)) {
String pid = (String) properties.get(Constants.SERVICE_PID);