projects
/
gpl
/
argeo-suite.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Keep working on authorisations.
[gpl/argeo-suite.git]
/
org.argeo.suite.ui
/
src
/
org
/
argeo
/
suite
/
ui
/
SuiteApp.java
diff --git
a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
index e363a62ff23d0b7ec325f5093a18701a61d2fbf9..d00efc9208469daa38f561163bdaee0c6a110a41 100644
(file)
--- a/
org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
+++ b/
org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
@@
-136,7
+136,7
@@
public class SuiteApp extends AbstractCmsApp implements EventHandler {
Session adminSession = null;
try {
adminSession = NodeUtils.openDataAdminSession(getRepository(), null);
Session adminSession = null;
try {
adminSession = NodeUtils.openDataAdminSession(getRepository(), null);
- Node userDir = SuiteUtils.getOrCreate
SessionDir
(adminSession, cmsSession);
+ Node userDir = SuiteUtils.getOrCreate
CmsSessionNode
(adminSession, cmsSession);
ui.initSessions(getRepository(), userDir.getPath());
} finally {
Jcr.logout(adminSession);
ui.initSessions(getRepository(), userDir.getPath());
} finally {
Jcr.logout(adminSession);
@@
-342,8
+342,8
@@
public class SuiteApp extends AbstractCmsApp implements EventHandler {
} else if (isTopic(event, SuiteEvent.switchLayer)) {
String layerId = get(event, SuiteEvent.LAYER);
if (layerId != null) {
} else if (isTopic(event, SuiteEvent.switchLayer)) {
String layerId = get(event, SuiteEvent.LAYER);
if (layerId != null) {
- ui.switchToLayer(layerId,
Jcr.getRootNode(ui.getSession(null)
));
- //ui.getCmsView().navigateTo("~");
+ ui.switchToLayer(layerId,
ui.getUserDir(
));
+ //
ui.getCmsView().navigateTo("~");
} else {
Node node = getNode(ui, event);
if (node != null) {
} else {
Node node = getNode(ui, event);
if (node != null) {