Merge remote-tracking branch 'origin/master' into v2.x

diff --git a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultEditionLayer.java b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultEditionLayer.java
index 92a9deaa858be86f51c7dd40a5b8297006b5f89f..89458552c8916ac8a2e9ff85c514bffcdcf31f1e 100644 (file)
--- a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultEditionLayer.java
+++ b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/DefaultEditionLayer.java
@@ -71,7 +71,7 @@ public class DefaultEditionLayer implements SuiteLayer {
                        try {
                                CmsUiUtils.clear(workAreaC);
                                workArea.createUi(workAreaC, context);
-                               workAreaC.requestLayout();
+                               workAreaC.layout(true, true);
                                return;
                        } catch (RepositoryException e) {
                                throw new JcrException("Cannot rebuild work area", e);

diff --git a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
index 5ca46393daeed6dc5423ec42f7204027e06cc6da..9a6208b7e0d86ef2e3a120a341e7124e87561e5f 100644 (file)
--- a/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
+++ b/core/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
@@ -343,16 +343,11 @@ public class SuiteApp extends AbstractCmsApp implements EventHandler {
                                        ui.getCmsView().stateChanged(state, appTitle);
                                        return;
                                }
-                               String currentLayerId = ui.getCurrentLayerId();
-//                             if (state.equals(currentLayerId))
-//                                     return; // does nothing
-//                             else {
                                Map<String, Object> properties = new HashMap<>();
                                String layerId = HOME_STATE.equals(state) ? defaultLayerPid : state;
                                properties.put(SuiteEvent.LAYER, layerId);
                                properties.put(SuiteEvent.NODE_PATH, HOME_STATE);
                                ui.getCmsView().sendEvent(SuiteEvent.switchLayer.topic(), properties);
-//                             }
                        }
                        return;
                }