projects
/
gpl
/
argeo-suite.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
5009609
)
Keep working on authorisations.
author
Mathieu Baudier <mbaudier@argeo.org>
Mon, 30 Nov 2020 12:47:26 +0000
(13:47 +0100)
committer
Mathieu Baudier <mbaudier@argeo.org>
Mon, 30 Nov 2020 12:47:26 +0000
(13:47 +0100)
org.argeo.suite.core/src/org/argeo/suite/SuiteUtils.java
patch
|
blob
|
history
org.argeo.suite.core/src/org/argeo/suite/core/SuiteMaintenanceService.java
patch
|
blob
|
history
org.argeo.suite.ui/src/org/argeo/suite/ui/SuiteApp.java
patch
|
blob
|
history
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 18c91a179a7bd0e090ff338d1d1313e5844015ba..b5acb2727857c4e0df8e2f659383ee7677ff57ca 100644
(file)
--- 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(),
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);
}
} 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 685e9939cdb860f0c9003ba90e4ec4fef2fcd386..66cabc4922ad92335896b805625ac7973c28f070 100644
(file)
--- 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);
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 31763fe7c736788487029a035841a9ab8b2a3ff2..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
@@
-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) {