From d24889c1dae4ac72e5f8808ad878a44eb9115645 Mon Sep 17 00:00:00 2001
From: uhensler <urs.hensler@frentix.com>
Date: Mon, 7 Oct 2019 10:34:23 +0200
Subject: [PATCH] OO-4285: Restrict rights to selected role in blog and podcast
course node
---
src/main/java/org/olat/course/nodes/BlogCourseNode.java | 5 +----
src/main/java/org/olat/course/nodes/PodcastCourseNode.java | 5 +----
2 files changed, 2 insertions(+), 8 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/BlogCourseNode.java b/src/main/java/org/olat/course/nodes/BlogCourseNode.java
index c6c44480fcf..df8a3d59235 100644
--- a/src/main/java/org/olat/course/nodes/BlogCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/BlogCourseNode.java
@@ -24,7 +24,6 @@ import java.util.List;
import java.util.Locale;
import org.olat.basesecurity.GroupRoles;
-import org.olat.basesecurity.OrganisationRoles;
import org.olat.core.CoreSpringFactory;
import org.olat.core.commons.services.notifications.SubscriptionContext;
import org.olat.core.gui.UserRequest;
@@ -136,9 +135,7 @@ public class BlogCourseNode extends AbstractFeedCourseNode {
RepositoryService repositoryService = CoreSpringFactory.getImpl(RepositoryService.class);
boolean isGuest = roles.isGuestOnly();
- boolean isAdmin = (roles.isAdministrator() || roles.isLearnResourceManager())
- && repositoryService.hasRoleExpanded(ureq.getIdentity(), entry,
- OrganisationRoles.administrator.name(), OrganisationRoles.learnresourcemanager.name());
+ boolean isAdmin = userCourseEnv.isAdmin();
boolean isOwner = !isGuest && repositoryService.hasRole(ureq.getIdentity(), entry, GroupRoles.owner.name());
callback = new FeedNodeSecurityCallback(ne, isAdmin, isOwner, isGuest);
}
diff --git a/src/main/java/org/olat/course/nodes/PodcastCourseNode.java b/src/main/java/org/olat/course/nodes/PodcastCourseNode.java
index 2a875e4208a..fec01884183 100644
--- a/src/main/java/org/olat/course/nodes/PodcastCourseNode.java
+++ b/src/main/java/org/olat/course/nodes/PodcastCourseNode.java
@@ -24,7 +24,6 @@ import java.util.List;
import java.util.Locale;
import org.olat.basesecurity.GroupRoles;
-import org.olat.basesecurity.OrganisationRoles;
import org.olat.core.CoreSpringFactory;
import org.olat.core.commons.services.notifications.SubscriptionContext;
import org.olat.core.gui.UserRequest;
@@ -131,9 +130,7 @@ public class PodcastCourseNode extends AbstractFeedCourseNode {
Roles roles = ureq.getUserSession().getRoles();
boolean isGuest = roles.isGuestOnly();
- boolean isAdmin = (roles.isAdministrator() || roles.isLearnResourceManager())
- && repositoryService.hasRoleExpanded(ureq.getIdentity(), entry,
- OrganisationRoles.administrator.name(), OrganisationRoles.learnresourcemanager.name());
+ boolean isAdmin = userCourseEnv.isAdmin();
boolean isOwner = !isGuest && repositoryService.hasRole(ureq.getIdentity(), entry, GroupRoles.owner.name());
FeedSecurityCallback callback;
if(userCourseEnv.isCourseReadOnly()) {
--
GitLab