Skip to content
Snippets Groups Projects
Commit d24889c1 authored by uhensler's avatar uhensler
Browse files

OO-4285: Restrict rights to selected role in blog and podcast course node

parent f928f6bd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/main/java/org/olat/course/nodes/BlogCourseNode.java
+ 1
− 4
View file @ d24889c1
...@@ -24,7 +24,6 @@ import java.util.List; ...@@ -24,7 +24,6 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import org.olat.basesecurity.GroupRoles; import org.olat.basesecurity.GroupRoles;
import org.olat.basesecurity.OrganisationRoles;
import org.olat.core.CoreSpringFactory; import org.olat.core.CoreSpringFactory;
import org.olat.core.commons.services.notifications.SubscriptionContext; import org.olat.core.commons.services.notifications.SubscriptionContext;
import org.olat.core.gui.UserRequest; import org.olat.core.gui.UserRequest;
...@@ -136,9 +135,7 @@ public class BlogCourseNode extends AbstractFeedCourseNode { ...@@ -136,9 +135,7 @@ public class BlogCourseNode extends AbstractFeedCourseNode {
RepositoryService repositoryService = CoreSpringFactory.getImpl(RepositoryService.class); RepositoryService repositoryService = CoreSpringFactory.getImpl(RepositoryService.class);
boolean isGuest = roles.isGuestOnly(); boolean isGuest = roles.isGuestOnly();
boolean isAdmin = (roles.isAdministrator() || roles.isLearnResourceManager()) boolean isAdmin = userCourseEnv.isAdmin();
&& repositoryService.hasRoleExpanded(ureq.getIdentity(), entry,
OrganisationRoles.administrator.name(), OrganisationRoles.learnresourcemanager.name());
boolean isOwner = !isGuest && repositoryService.hasRole(ureq.getIdentity(), entry, GroupRoles.owner.name()); boolean isOwner = !isGuest && repositoryService.hasRole(ureq.getIdentity(), entry, GroupRoles.owner.name());
callback = new FeedNodeSecurityCallback(ne, isAdmin, isOwner, isGuest); callback = new FeedNodeSecurityCallback(ne, isAdmin, isOwner, isGuest);
} }
......
src/main/java/org/olat/course/nodes/PodcastCourseNode.java
+ 1
− 4
View file @ d24889c1
...@@ -24,7 +24,6 @@ import java.util.List; ...@@ -24,7 +24,6 @@ import java.util.List;
import java.util.Locale; import java.util.Locale;
import org.olat.basesecurity.GroupRoles; import org.olat.basesecurity.GroupRoles;
import org.olat.basesecurity.OrganisationRoles;
import org.olat.core.CoreSpringFactory; import org.olat.core.CoreSpringFactory;
import org.olat.core.commons.services.notifications.SubscriptionContext; import org.olat.core.commons.services.notifications.SubscriptionContext;
import org.olat.core.gui.UserRequest; import org.olat.core.gui.UserRequest;
...@@ -131,9 +130,7 @@ public class PodcastCourseNode extends AbstractFeedCourseNode { ...@@ -131,9 +130,7 @@ public class PodcastCourseNode extends AbstractFeedCourseNode {
Roles roles = ureq.getUserSession().getRoles(); Roles roles = ureq.getUserSession().getRoles();
boolean isGuest = roles.isGuestOnly(); boolean isGuest = roles.isGuestOnly();
boolean isAdmin = (roles.isAdministrator() || roles.isLearnResourceManager()) boolean isAdmin = userCourseEnv.isAdmin();
&& repositoryService.hasRoleExpanded(ureq.getIdentity(), entry,
OrganisationRoles.administrator.name(), OrganisationRoles.learnresourcemanager.name());
boolean isOwner = !isGuest && repositoryService.hasRole(ureq.getIdentity(), entry, GroupRoles.owner.name()); boolean isOwner = !isGuest && repositoryService.hasRole(ureq.getIdentity(), entry, GroupRoles.owner.name());
FeedSecurityCallback callback; FeedSecurityCallback callback;
if(userCourseEnv.isCourseReadOnly()) { if(userCourseEnv.isCourseReadOnly()) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment