From 58cf7a0df60e5f17d34dd26b9d08b00939d29d41 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 30 Nov 2020 13:47:26 +0100 Subject: [PATCH] Keep working on authorisations. --- org.argeo.suite.core/src/org/argeo/suite/SuiteUtils.java | 2 +- .../src/org/argeo/suite/core/SuiteMaintenanceService.java | 2 +- org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/org.argeo.suite.core/src/org/argeo/suite/SuiteUtils.java b/org.argeo.suite.core/src/org/argeo/suite/SuiteUtils.java index 18c91a1..b5acb27 100644 --- a/org.argeo.suite.core/src/org/argeo/suite/SuiteUtils.java +++ b/org.argeo.suite.core/src/org/argeo/suite/SuiteUtils.java @@ -38,7 +38,7 @@ public class SuiteUtils { JackrabbitSecurityUtils.denyPrivilege(adminSession, userNode.getPath(), SuiteRole.coworker.dn(), Privilege.JCR_READ); JcrUtils.addPrivilege(adminSession, userNode.getPath(), new X500Principal(userDn.toString()).getName(), - Privilege.JCR_ALL); + Privilege.JCR_READ); } else { userNode = usersBase.getNode(uid); } diff --git a/org.argeo.suite.core/src/org/argeo/suite/core/SuiteMaintenanceService.java b/org.argeo.suite.core/src/org/argeo/suite/core/SuiteMaintenanceService.java index 685e993..66cabc4 100644 --- a/org.argeo.suite.core/src/org/argeo/suite/core/SuiteMaintenanceService.java +++ b/org.argeo.suite.core/src/org/argeo/suite/core/SuiteMaintenanceService.java @@ -34,7 +34,7 @@ public class SuiteMaintenanceService extends AbstractMaintenanceService { public void configurePrivileges(Session adminSession) throws RepositoryException { JcrUtils.addPrivilege(adminSession, EntityType.user.basePath(), NodeConstants.ROLE_USER_ADMIN, Privilege.JCR_ALL); - JcrUtils.addPrivilege(adminSession, "/", SuiteRole.coworker.dn(), Privilege.JCR_READ); + //JcrUtils.addPrivilege(adminSession, "/", SuiteRole.coworker.dn(), Privilege.JCR_READ); } } 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 31763fe..d00efc9 100644 --- a/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java +++ b/org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java @@ -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) { - 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) { -- 2.30.2