OO-3516: implements principal role for courses

src/main/java/de/bps/course/nodes/ChecklistCourseNode.java

@@ -196,13 +196,12 @@ public class ChecklistCourseNode extends AbstractAccessableCourseNode {
 			UserCourseEnvironment userCourseEnv, NodeEvaluation ne, String nodecmd) {
 		ICourse course = CourseFactory.loadCourse(userCourseEnv.getCourseEnvironment().getCourseResourceableId());
 		CourseGroupManager cgm = course.getCourseEnvironment().getCourseGroupManager();
-		boolean canEdit = cgm.isIdentityCourseAdministrator(ureq.getIdentity());
+		boolean canEdit = userCourseEnv.isAdmin();
 		boolean canManage;
 		if(canEdit) {
 			canManage = true;
 		} else {
-			canManage = cgm.isIdentityCourseCoach(ureq.getIdentity())
-					|| cgm.hasRight(ureq.getIdentity(), CourseRights.RIGHT_GROUPMANAGEMENT);
+			canManage = userCourseEnv.isCoach() || cgm.hasRight(ureq.getIdentity(), CourseRights.RIGHT_GROUPMANAGEMENT);
 		}
 		Checklist checklist = loadOrCreateChecklist(userCourseEnv.getCourseEnvironment().getCoursePropertyManager());
 		ChecklistDisplayController checkController = new ChecklistDisplayController(ureq, wControl, checklist,

src/main/java/de/bps/course/nodes/VCCourseNode.java

@@ -35,7 +35,6 @@ import org.olat.course.condition.ConditionEditController;
 import org.olat.course.editor.CourseEditorEnv;
 import org.olat.course.editor.NodeEditController;
 import org.olat.course.editor.StatusDescription;
-import org.olat.course.groupsandrights.CourseGroupManager;
 import org.olat.course.nodes.AbstractAccessableCourseNode;
 import org.olat.course.nodes.CourseNode;
 import org.olat.course.nodes.StatusDescriptionHelper;
@@ -134,8 +133,7 @@ public class VCCourseNode extends AbstractAccessableCourseNode {
 			UserCourseEnvironment userCourseEnv, NodeEvaluation ne, String nodecmd) {
 		updateModuleConfigDefaults(false);
 		// check if user is moderator of the virtual classroom
-		CourseGroupManager cgm = userCourseEnv.getCourseEnvironment().getCourseGroupManager();
-		boolean moderator = cgm.isIdentityCourseAdministrator(ureq.getIdentity());
+		boolean moderator = userCourseEnv.isAdmin();
 
 		// load configuration
 		final String providerId = getModuleConfiguration().getStringValue(CONF_PROVIDER_ID);

src/main/java/de/bps/course/nodes/den/DENRunController.java

@@ -45,7 +45,6 @@ import org.olat.core.util.event.GenericEventListener;
 import org.olat.core.util.resource.OresHelper;
 import org.olat.course.CourseFactory;
 import org.olat.course.ICourse;
-import org.olat.course.groupsandrights.CourseGroupManager;
 import org.olat.course.nodes.ObjectivesHelper;
 import org.olat.course.run.userview.UserCourseEnvironment;
 import org.olat.modules.ModuleConfiguration;
@@ -110,9 +109,7 @@ public class DENRunController extends BasicController implements GenericEventLis
 		runVC = new VelocityContainer("dateVC", VELOCITY_ROOT + "/run.html", getTranslator(), this);
 		
 		//show only the options for managing dates and participants if user is admin or course coach
-		
-		CourseGroupManager cgm = course.getCourseEnvironment().getCourseGroupManager();
-		if(cgm.isIdentityCourseAdministrator(ureq.getIdentity()) || cgm.isIdentityCourseCoach(ureq.getIdentity())) {
+		if(userCourseEnv.isAdmin() || userCourseEnv.isCoach()) {
 			// subscription
 			subsContext = new SubscriptionContext(course, courseNode.getIdent());
 			// if sc is null, then no subscription is desired

src/main/java/org/olat/course/CourseFactory.java

@@ -635,7 +635,7 @@ public class CourseFactory {
 
 			ContextEntry ce = BusinessControlFactory.getInstance().createContextEntry(entry);
 			WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ce, wControl);
-			RepositoryEntrySecurity reSecurity = new RepositoryEntrySecurity(false, false, false, false, false, false, false, false, false, false, true, false);
+			RepositoryEntrySecurity reSecurity = new RepositoryEntrySecurity(false, false, false, false, false, false, false, false, false, false, false, true, false);
 			return new RunMainController(ureq, bwControl, null, course, entry, reSecurity, null);
 		}
 	}

src/main/java/org/olat/course/assessment/ui/mode/AssessmentModeListController.java

@@ -66,25 +66,28 @@ import org.springframework.beans.factory.annotation.Autowired;
  */
 public class AssessmentModeListController extends FormBasicController implements GenericEventListener {
 
+	private FormLink addLink;
+	private FormLink deleteLink;
 	private FlexiTableElement tableEl;
-	private FormLink addLink, deleteLink;
 	private AssessmentModeListModel model;
 	private final TooledStackedPanel toolbarPanel;
 
-	private DialogBoxController startDialogBox, stopDialogBox,deleteDialogBox;
+	private DialogBoxController startDialogBox, stopDialogBox, deleteDialogBox;
 	private AssessmentModeEditController editCtrl;
 	
 	private final RepositoryEntry entry;
+	private final AssessmentModeSecurityCallback secCallback;
 	
 	@Autowired
 	private AssessmentModeManager assessmentModeMgr;
 	@Autowired
 	private AssessmentModeCoordinationService assessmentModeCoordinationService;
 	
-	public AssessmentModeListController(UserRequest ureq, WindowControl wControl,
-			TooledStackedPanel toolbarPanel, RepositoryEntry entry) {
+	public AssessmentModeListController(UserRequest ureq, WindowControl wControl, TooledStackedPanel toolbarPanel,
+			RepositoryEntry entry, AssessmentModeSecurityCallback secCallback) {
 		super(ureq, wControl, "mode_list");
 		this.entry = entry;
+		this.secCallback = secCallback;
 		this.toolbarPanel = toolbarPanel;
 		toolbarPanel.addListener(this);
 		
@@ -105,13 +108,14 @@ public class AssessmentModeListController extends FormBasicController implements
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
-		addLink = uifactory.addFormLink("add", "add", "add.mode", null, formLayout, Link.BUTTON);
-		addLink.setElementCssClass("o_sel_assessment_mode_add");
-		addLink.setIconLeftCSS("o_icon o_icon_add");
-		
-		
-		deleteLink = uifactory.addFormLink("delete", "delete", "delete.mode", null, formLayout, Link.BUTTON);
-		deleteLink.setIconLeftCSS("o_icon o_icon_delete");
+		if(secCallback.canEditAssessmentMode()) {
+			addLink = uifactory.addFormLink("add", "add", "add.mode", null, formLayout, Link.BUTTON);
+			addLink.setElementCssClass("o_sel_assessment_mode_add");
+			addLink.setIconLeftCSS("o_icon o_icon_add");
+			
+			deleteLink = uifactory.addFormLink("delete", "delete", "delete.mode", null, formLayout, Link.BUTTON);
+			deleteLink.setIconLeftCSS("o_icon o_icon_delete");
+		}
 		
 		//add the table
 		FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
@@ -126,16 +130,21 @@ public class AssessmentModeListController extends FormBasicController implements
 				true, Cols.followupTime.name(), new TimeCellRenderer(getTranslator())));
 		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(Cols.target.i18nKey(), Cols.target.ordinal(),
 				true, Cols.target.name(), new TargetAudienceCellRenderer(getTranslator())));
-		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel("start", Cols.start.ordinal(), "start",
+		
+		if(secCallback.canStartStopAssessment()) {
+			columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel("start", Cols.start.ordinal(), "start",
 				new BooleanCellRenderer(new StaticFlexiCellRenderer(translate("start"), "start"), null)));
-		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel("stop", Cols.stop.ordinal(), "stop",
+			columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel("stop", Cols.stop.ordinal(), "stop",
 				new BooleanCellRenderer(new StaticFlexiCellRenderer(translate("stop"), "stop"), null)));
-		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel("edit", translate("edit"), "edit"));
+		}
+		if(secCallback.canEditAssessmentMode()) {
+			columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel("edit", translate("edit"), "edit"));
+		}
 		
 		model = new AssessmentModeListModel(columnsModel, getTranslator(), assessmentModeCoordinationService);
 		tableEl = uifactory.addTableElement(getWindowControl(), "table", model, 20, false, getTranslator(), formLayout);
-		tableEl.setMultiSelect(true);
-		tableEl.setSelectAllEnable(true);
+		tableEl.setMultiSelect(secCallback.canEditAssessmentMode());
+		tableEl.setSelectAllEnable(secCallback.canEditAssessmentMode());
 	}
 	
 	private void loadModel() {
@@ -143,9 +152,10 @@ public class AssessmentModeListController extends FormBasicController implements
 		model.setObjects(modes);
 		tableEl.reloadData();
 		// don't show table and button if there is nothing
-		tableEl.setVisible(modes.size() > 0);
-		deleteLink.setVisible(modes.size() > 0);
-
+		tableEl.setVisible(!modes.isEmpty());
+		if(deleteLink != null) {
+			deleteLink.setVisible(!modes.isEmpty());
+		}
 	}
 
 	@Override
@@ -210,7 +220,7 @@ public class AssessmentModeListController extends FormBasicController implements
 			if(index == null || index.isEmpty()) {
 				showWarning("error.atleastone");
 			} else {
-				List<AssessmentMode> rows = new ArrayList<AssessmentMode>(index.size());
+				List<AssessmentMode> rows = new ArrayList<>(index.size());
 				for(Integer i:index) {
 					rows.add(model.getObject(i.intValue()));
 				}

src/main/java/org/olat/course/assessment/ui/mode/AssessmentModeSecurityCallback.java

+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Initial code contributed and copyrighted by<br>
+ * frentix GmbH, http://www.frentix.com
+ * <p>
+ */
+package org.olat.course.assessment.ui.mode;
+
+/**
+ * 
+ * Initial date: 20 juil. 2018<br>
+ * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
+ *
+ */
+public interface AssessmentModeSecurityCallback {
+	
+	public boolean canStartStopAssessment();
+	
+	public boolean canEditAssessmentMode();
+
+}

src/main/java/org/olat/course/assessment/ui/mode/AssessmentModeSecurityCallbackFactory.java

+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Initial code contributed and copyrighted by<br>
+ * frentix GmbH, http://www.frentix.com
+ * <p>
+ */
+package org.olat.course.assessment.ui.mode;
+
+/**
+ * 
+ * Initial date: 20 juil. 2018<br>
+ * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
+ *
+ */
+public class AssessmentModeSecurityCallbackFactory {
+	
+	public static AssessmentModeSecurityCallback getSecurityCallback(boolean canModify) {
+		return new AssessmentModeSecurityCallbackImpl(canModify);
+	}
+	
+	private static class AssessmentModeSecurityCallbackImpl implements AssessmentModeSecurityCallback {
+		
+		private final boolean canModify;
+		
+		public AssessmentModeSecurityCallbackImpl(boolean canModify) {
+			this.canModify = canModify;
+		}
+
+		@Override
+		public boolean canStartStopAssessment() {
+			return canModify;
+		}
+
+		@Override
+		public boolean canEditAssessmentMode() {
+			return canModify;
+		}
+	}
+}

src/main/java/org/olat/course/assessment/ui/mode/_content/mode_list.html

 <fieldset class="o_sel_assessment_mode_list">
 	<legend>$r.translate("modes.title")</legend>
 	<div class="o_info">$r.translate("modes.description")</div>
-	<div class="o_button_group o_button_group_right">$r.render("add")</div>
+	#if($r.available("add"))
+		<div class="o_button_group o_button_group_right">$r.render("add")</div>
+	#end
 	$r.render("table")
-	<div class="o_button_group">$r.render("delete")</div>
+	#if($r.available("delete"))
+		<div class="o_button_group">$r.render("delete")</div>
+	#end
 </fieldset>
\ No newline at end of file

src/main/java/org/olat/course/assessment/ui/tool/AssessmentCourseOverviewController.java

@@ -84,7 +84,7 @@ public class AssessmentCourseOverviewController extends BasicController {
 		
 		ICourse course = CourseFactory.loadCourse(courseEntry);
 		boolean hasAssessableNodes = course.hasAssessableNodes();
-		mainVC.contextPut("hasAssessableNodes", new Boolean(hasAssessableNodes));
+		mainVC.contextPut("hasAssessableNodes", Boolean.valueOf(hasAssessableNodes));
 		
 		// assessment changes subscription
 		if (hasAssessableNodes) {

src/main/java/org/olat/course/groupsandrights/PersistingCourseGroupManager.java

@@ -278,7 +278,7 @@ public class PersistingCourseGroupManager implements CourseGroupManager {
 		// not really a group management method, for your convenience we have a
 		// shortcut here...
 		return repositoryService.hasRoleExpanded(identity, getCourseEntry(), OrganisationRoles.administrator.name(),
-				OrganisationRoles.learnresourcemanager.name(), GroupRoles.owner.name());
+				OrganisationRoles.principal.name(), OrganisationRoles.learnresourcemanager.name(), GroupRoles.owner.name());
 	}
 
 	@Override

src/main/java/org/olat/course/member/MemberListController.java

@@ -27,6 +27,7 @@ import org.olat.core.util.StringHelper;
 import org.olat.course.assessment.ui.tool.AssessmentIdentityCourseController;
 import org.olat.course.run.userview.UserCourseEnvironment;
 import org.olat.group.ui.main.AbstractMemberListController;
+import org.olat.group.ui.main.MemberListSecurityCallback;
 import org.olat.group.ui.main.MemberRow;
 import org.olat.group.ui.main.SearchMembersParams;
 import org.olat.repository.RepositoryEntry;
@@ -43,8 +44,9 @@ public class MemberListController extends AbstractMemberListController {
 	private final UserCourseEnvironment coachCourseEnv;
 	
 	public MemberListController(UserRequest ureq, WindowControl wControl, TooledStackedPanel stackPanel,
-			RepositoryEntry repoEntry, UserCourseEnvironment coachCourseEnv, SearchMembersParams searchParams, String infos) {
-		super(ureq, wControl, repoEntry, "all_member_list", coachCourseEnv.isCourseReadOnly(), stackPanel);
+			RepositoryEntry repoEntry, UserCourseEnvironment coachCourseEnv, MemberListSecurityCallback secCallback,
+			SearchMembersParams searchParams, String infos) {
+		super(ureq, wControl, repoEntry, "all_member_list", secCallback, stackPanel);
 		this.searchParams = searchParams;
 		this.coachCourseEnv = coachCourseEnv;
 		

src/main/java/org/olat/course/member/MemberListWithOriginFilterController.java

@@ -32,6 +32,7 @@ import org.olat.core.util.StringHelper;
 import org.olat.course.assessment.ui.tool.AssessmentIdentityCourseController;
 import org.olat.course.run.userview.UserCourseEnvironment;
 import org.olat.group.ui.main.AbstractMemberListController;
+import org.olat.group.ui.main.MemberListSecurityCallback;
 import org.olat.group.ui.main.MemberRow;
 import org.olat.group.ui.main.SearchMembersParams;
 import org.olat.group.ui.main.SearchMembersParams.Origin;
@@ -53,8 +54,8 @@ public class MemberListWithOriginFilterController extends AbstractMemberListCont
 	private final UserCourseEnvironment coachCourseEnv;
 	
 	public MemberListWithOriginFilterController(UserRequest ureq, WindowControl wControl, TooledStackedPanel toolbarPanel,
-			RepositoryEntry repoEntry, UserCourseEnvironment coachCourseEnv, SearchMembersParams searchParams, String infos) {
-		super(ureq, wControl, repoEntry, "member_list_origin_filter", coachCourseEnv.isCourseReadOnly(), toolbarPanel);
+			RepositoryEntry repoEntry, UserCourseEnvironment coachCourseEnv, MemberListSecurityCallback secCallback, SearchMembersParams searchParams, String infos) {
+		super(ureq, wControl, repoEntry, "member_list_origin_filter", secCallback, toolbarPanel);
 		this.searchParams = searchParams;
 		this.coachCourseEnv = coachCourseEnv;
 		

src/main/java/org/olat/course/member/MemberSearchController.java

@@ -29,6 +29,7 @@ import org.olat.core.id.Identity;
 import org.olat.course.assessment.ui.tool.AssessmentIdentityCourseController;
 import org.olat.course.run.userview.UserCourseEnvironment;
 import org.olat.group.ui.main.AbstractMemberListController;
+import org.olat.group.ui.main.MemberListSecurityCallback;
 import org.olat.group.ui.main.MemberRow;
 import org.olat.group.ui.main.SearchMembersParams;
 import org.olat.repository.RepositoryEntry;
@@ -46,8 +47,8 @@ public class MemberSearchController extends AbstractMemberListController {
 	private AssessmentIdentityCourseController identityAssessmentController;
 	
 	public MemberSearchController(UserRequest ureq, WindowControl wControl, TooledStackedPanel toolbarPanel,
-			RepositoryEntry repoEntry, UserCourseEnvironment coachCourseEnv) {
-		super(ureq, wControl, repoEntry, "all_member_list", coachCourseEnv.isCourseReadOnly(), toolbarPanel);
+			RepositoryEntry repoEntry, UserCourseEnvironment coachCourseEnv, MemberListSecurityCallback secCallback) {
+		super(ureq, wControl, repoEntry, "all_member_list", secCallback, toolbarPanel);
 		this.coachCourseEnv = coachCourseEnv;
 	}
 

src/main/java/org/olat/course/member/MembersManagementMainController.java

@@ -47,6 +47,8 @@ import org.olat.course.CourseFactory;
 import org.olat.course.ICourse;
 import org.olat.course.groupsandrights.GroupsAndRightsController;
 import org.olat.course.run.userview.UserCourseEnvironment;
+import org.olat.group.ui.main.MemberListSecurityCallback;
+import org.olat.group.ui.main.MemberListSecurityCallbackFactory;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryEntryManagedFlag;
 import org.olat.resource.accesscontrol.ACService;
@@ -84,7 +86,11 @@ public class MembersManagementMainController extends MainLayoutBasicController i
 	private RepositoryEntry repoEntry;
 	private final UserCourseEnvironment coachCourseEnv;
 	
-	private final boolean entryAdmin, groupManagementRight, memberManagementRight;
+	private final boolean entryAdmin;
+	private final boolean principal;
+	private final boolean groupManagementRight;
+	private final boolean memberManagementRight;
+	private final MemberListSecurityCallback secCallback;
 	
 	@Autowired
 	private ACService acService;
@@ -92,15 +98,18 @@ public class MembersManagementMainController extends MainLayoutBasicController i
 	private AccessControlModule acModule;
 
 	public MembersManagementMainController(UserRequest ureq, WindowControl wControl, TooledStackedPanel toolbarPanel,
-			RepositoryEntry re, UserCourseEnvironment coachCourseEnv, boolean entryAdmin,
+			RepositoryEntry re, UserCourseEnvironment coachCourseEnv, boolean entryAdmin, boolean principal,
 			boolean groupManagementRight, boolean memberManagementRight) {
 		super(ureq, wControl);
 		this.repoEntry = re;
 		this.toolbarPanel = toolbarPanel;
 		this.entryAdmin = entryAdmin;
+		this.principal = principal;
 		this.groupManagementRight = groupManagementRight;
 		this.memberManagementRight = memberManagementRight;
 		this.coachCourseEnv = coachCourseEnv;
+		secCallback = MemberListSecurityCallbackFactory.getSecurityCallback(coachCourseEnv.isCourseReadOnly(),
+				entryAdmin || groupManagementRight || memberManagementRight);
 
 		//logging
 		getUserActivityLogger().setStickyActionType(ActionType.admin);
@@ -119,7 +128,7 @@ public class MembersManagementMainController extends MainLayoutBasicController i
 		listenTo(columnLayoutCtr);
 		putInitialPanel(columnLayoutCtr.getInitialComponent());
 		
-		if(entryAdmin || memberManagementRight) {
+		if(entryAdmin || principal || memberManagementRight) {
 			selectMenuItem(ureq, CMD_MEMBERS);
 		} else if(groupManagementRight) {
 			selectMenuItem(ureq, CMD_GROUPS);
@@ -133,21 +142,21 @@ public class MembersManagementMainController extends MainLayoutBasicController i
 		root.setAltText(translate("menu.members.alt"));
 		gtm.setRootNode(root);
 		
-		if(entryAdmin || memberManagementRight) {
+		if(entryAdmin || principal || memberManagementRight) {
 			GenericTreeNode node = new GenericTreeNode(translate("menu.members"), CMD_MEMBERS);
 			node.setAltText(translate("menu.members.alt"));
 			node.setCssClass("o_sel_membersmgt_members");
 			root.addChild(node);
 		}
 
-		if(entryAdmin || memberManagementRight || groupManagementRight) {
+		if(entryAdmin || principal || memberManagementRight || groupManagementRight) {
 			GenericTreeNode node = new GenericTreeNode(translate("menu.groups"), CMD_GROUPS);
 			node.setAltText(translate("menu.groups.alt"));
 			node.setCssClass("o_sel_membersmgt_groups");
 			root.addChild(node);
 		}
 
-		if(acModule.isEnabled() && (entryAdmin || memberManagementRight)) {
+		if(acModule.isEnabled() && (entryAdmin || principal ||  memberManagementRight)) {
 			//check if the course is managed and/or has offers
 			if(!RepositoryEntryManagedFlag.isManaged(repoEntry, RepositoryEntryManagedFlag.bookings)
 					|| acService.isResourceAccessControled(repoEntry.getOlatResource(), null)) {
@@ -158,7 +167,7 @@ public class MembersManagementMainController extends MainLayoutBasicController i
 			}
 		}
 
-		if(entryAdmin) {
+		if(entryAdmin || principal) {
 			GenericTreeNode node = new GenericTreeNode(translate("menu.rights"), CMD_RIGHTS);
 			node.setAltText(translate("menu.rights.alt"));
 			node.setCssClass("o_sel_membersmgt_rights");
@@ -214,9 +223,9 @@ public class MembersManagementMainController extends MainLayoutBasicController i
 		
 		Controller selectedCtrl = null;
 		if(CMD_MEMBERS.equals(cmd)) {
-			if(entryAdmin || memberManagementRight) {
+			if(entryAdmin ||  principal || memberManagementRight) {
 				if(membersOverviewCtrl == null) {
-					membersOverviewCtrl = new MembersOverviewController(ureq, bwControl, toolbarPanel, repoEntry, coachCourseEnv);
+					membersOverviewCtrl = new MembersOverviewController(ureq, bwControl, toolbarPanel, repoEntry, coachCourseEnv, secCallback);
 					listenTo(membersOverviewCtrl);
 				} else if(membersDirty) {
 					membersOverviewCtrl.reloadMembers();
@@ -225,7 +234,7 @@ public class MembersManagementMainController extends MainLayoutBasicController i
 				selectedCtrl = membersOverviewCtrl;
 			}
 		} else if(CMD_GROUPS.equals(cmd)) {
-			if(entryAdmin || memberManagementRight || groupManagementRight) {
+			if(entryAdmin ||  principal || memberManagementRight || groupManagementRight) {
 				if(groupsCtrl == null) {
 					groupsCtrl = new CourseBusinessGroupListController(ureq, bwControl, repoEntry, entryAdmin || groupManagementRight, coachCourseEnv.isCourseReadOnly());
 					listenTo(groupsCtrl);
@@ -235,7 +244,7 @@ public class MembersManagementMainController extends MainLayoutBasicController i
 				selectedCtrl = groupsCtrl;
 			}
 		} else if(CMD_BOOKING.equals(cmd)) {
-			if(acModule.isEnabled() && (entryAdmin || memberManagementRight)) {
+			if(acModule.isEnabled() && (entryAdmin ||  principal || memberManagementRight)) {
 				if(ordersController == null) {
 					ordersController = new OrdersAdminController(ureq, bwControl, toolbarPanel, repoEntry.getOlatResource());
 					listenTo(ordersController);
@@ -244,7 +253,7 @@ public class MembersManagementMainController extends MainLayoutBasicController i
 				selectedCtrl = ordersController;
 			}
 		} else if(CMD_RIGHTS.equals(cmd)) {
-			if(entryAdmin) {
+			if(entryAdmin ||  principal) {
 				if(rightsController == null) {
 					rightsController = new GroupsAndRightsController(ureq, bwControl, repoEntry, coachCourseEnv.isCourseReadOnly());
 					listenTo(rightsController);

src/main/java/org/olat/course/member/MembersOverviewController.java

@@ -62,6 +62,7 @@ import org.olat.group.BusinessGroupService;
 import org.olat.group.model.BusinessGroupMembershipChange;
 import org.olat.group.ui.main.AbstractMemberListController;
 import org.olat.group.ui.main.DedupMembersConfirmationController;
+import org.olat.group.ui.main.MemberListSecurityCallback;
 import org.olat.group.ui.main.MemberPermissionChangeEvent;
 import org.olat.group.ui.main.SearchMembersParams;
 import org.olat.modules.curriculum.CurriculumService;
@@ -112,6 +113,7 @@ public class MembersOverviewController extends BasicController implements Activa
 	private boolean overrideManaged = false;
 	private final RepositoryEntry repoEntry;
 	private final UserCourseEnvironment coachCourseEnv;
+	private final MemberListSecurityCallback secCallback;
 	
 	@Autowired
 	private RepositoryManager repositoryManager;
@@ -123,11 +125,12 @@ public class MembersOverviewController extends BasicController implements Activa
 	private BusinessGroupService businessGroupService;
 	
 	public MembersOverviewController(UserRequest ureq, WindowControl wControl, TooledStackedPanel toolbarPanel,
-			RepositoryEntry repoEntry, UserCourseEnvironment coachCourseEnv) {
+			RepositoryEntry repoEntry, UserCourseEnvironment coachCourseEnv, MemberListSecurityCallback secCallback) {
 		super(ureq, wControl);
 		this.repoEntry = repoEntry;
 		this.toolbarPanel = toolbarPanel;
 		this.coachCourseEnv = coachCourseEnv;
+		this.secCallback = secCallback;
 		
 		mainVC = createVelocityContainer("members_overview");
 		segmentView = SegmentViewFactory.createSegmentView("segments", mainVC, this);
@@ -352,12 +355,9 @@ public class MembersOverviewController extends BasicController implements Activa
 		removeAsListenerAndDispose(importMembersWizard);
 
 		Step start = new ImportMember_1b_ChooseMemberStep(ureq, repoEntry, null, overrideManaged);
-		StepRunnerCallback finish = new StepRunnerCallback() {
-			@Override
-			public Step execute(UserRequest uureq, WindowControl wControl, StepsRunContext runContext) {
-				addMembers(uureq, runContext);
-				return StepsMainRunController.DONE_MODIFIED;
-			}
+		StepRunnerCallback finish = (uureq, wControl, runContext) -> {
+			addMembers(uureq, runContext);
+			return StepsMainRunController.DONE_MODIFIED;
 		};
 		
 		importMembersWizard = new StepsMainRunController(ureq, getWindowControl(), start, finish, null,
@@ -370,15 +370,12 @@ public class MembersOverviewController extends BasicController implements Activa
 		removeAsListenerAndDispose(importMembersWizard);
 
 		Step start = new ImportMember_1a_LoginListStep(ureq, repoEntry, null, overrideManaged);
-		StepRunnerCallback finish = new StepRunnerCallback() {
-			@Override
-			public Step execute(UserRequest uureq, WindowControl wControl, StepsRunContext runContext) {
-				addMembers(uureq, runContext);
-				if(runContext.containsKey("notFounds")) {
-					showWarning("user.notfound", runContext.get("notFounds").toString());
-				}
-				return StepsMainRunController.DONE_MODIFIED;
+		StepRunnerCallback finish = (uureq, wControl, runContext) -> {
+			addMembers(uureq, runContext);
+			if(runContext.containsKey("notFounds")) {
+				showWarning("user.notfound", runContext.get("notFounds").toString());
 			}
+			return StepsMainRunController.DONE_MODIFIED;
 		};
 		
 		importMembersWizard = new StepsMainRunController(ureq, getWindowControl(), start, finish, null,
@@ -457,7 +454,7 @@ public class MembersOverviewController extends BasicController implements Activa
 			ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
 			WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
 			SearchMembersParams searchParams = new SearchMembersParams(true, GroupRoles.owner, GroupRoles.coach, GroupRoles.participant);
-			allMemberListCtrl = new MemberListWithOriginFilterController(ureq, bwControl, toolbarPanel, repoEntry, coachCourseEnv, searchParams, null);
+			allMemberListCtrl = new MemberListWithOriginFilterController(ureq, bwControl, toolbarPanel, repoEntry, coachCourseEnv, secCallback, searchParams, null);
 			listenTo(allMemberListCtrl);
 		}
 		
@@ -475,7 +472,7 @@ public class MembersOverviewController extends BasicController implements Activa
 			WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
 			SearchMembersParams searchParams = new SearchMembersParams(false, GroupRoles.owner);
 			String infos = translate("owners.infos");
-			ownersCtrl = new MemberListController(ureq, bwControl, toolbarPanel, repoEntry, coachCourseEnv, searchParams, infos);
+			ownersCtrl = new MemberListController(ureq, bwControl, toolbarPanel, repoEntry, coachCourseEnv, secCallback, searchParams, infos);
 			listenTo(ownersCtrl);
 		}
 		
@@ -493,7 +490,7 @@ public class MembersOverviewController extends BasicController implements Activa
 			WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
 			SearchMembersParams searchParams = new SearchMembersParams(false, GroupRoles.coach);
 			String infos = translate("tutors.infos");
-			tutorsCtrl = new MemberListWithOriginFilterController(ureq, bwControl, toolbarPanel, repoEntry, coachCourseEnv, searchParams, infos);
+			tutorsCtrl = new MemberListWithOriginFilterController(ureq, bwControl, toolbarPanel, repoEntry, coachCourseEnv, secCallback, searchParams, infos);
 			listenTo(tutorsCtrl);
 		}
 		
@@ -511,7 +508,7 @@ public class MembersOverviewController extends BasicController implements Activa
 			WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
 			SearchMembersParams searchParams = new SearchMembersParams(false, GroupRoles.participant);
 			String infos = translate("participants.infos");
-			participantsCtrl = new MemberListWithOriginFilterController(ureq, bwControl, toolbarPanel, repoEntry, coachCourseEnv, searchParams, infos);
+			participantsCtrl = new MemberListWithOriginFilterController(ureq, bwControl, toolbarPanel, repoEntry, coachCourseEnv, secCallback, searchParams, infos);
 			listenTo(participantsCtrl);
 		}
 		
@@ -529,7 +526,7 @@ public class MembersOverviewController extends BasicController implements Activa
 			WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
 			SearchMembersParams searchParams = new SearchMembersParams(false, GroupRoles.waiting);
 			String infos = translate("waiting.infos");
-			waitingCtrl = new MemberListController(ureq, bwControl, toolbarPanel, repoEntry, coachCourseEnv, searchParams, infos);
+			waitingCtrl = new MemberListController(ureq, bwControl, toolbarPanel, repoEntry, coachCourseEnv, secCallback, searchParams, infos);
 			listenTo(waitingCtrl);
 		}
 		
@@ -545,7 +542,7 @@ public class MembersOverviewController extends BasicController implements Activa
 			OLATResourceable ores = OresHelper.createOLATResourceableInstance(SEG_SEARCH_MEMBERS, 0l);
 			ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
 			WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ores, null, getWindowControl());
-			searchCtrl = new MemberSearchController(ureq, bwControl, toolbarPanel, repoEntry, coachCourseEnv);
+			searchCtrl = new MemberSearchController(ureq, bwControl, toolbarPanel, repoEntry, coachCourseEnv, secCallback);
 			listenTo(searchCtrl);
 		}
 	

src/main/java/org/olat/course/nodes/GoToMeetingCourseNode.java

@@ -109,9 +109,8 @@ public class GoToMeetingCourseNode extends AbstractAccessableCourseNode {
 			controller = MessageUIFactory.createInfoMessage(ureq, wControl, title, message);
 		} else {
 			// check if user is moderator of the virtual classroom
-			CourseGroupManager cgm = userCourseEnv.getCourseEnvironment().getCourseGroupManager();
-			boolean admin = cgm.isIdentityCourseAdministrator(ureq.getIdentity());
-			boolean moderator = admin || cgm.isIdentityCourseCoach(ureq.getIdentity());
+			boolean admin = userCourseEnv.isAdmin();
+			boolean moderator = admin || userCourseEnv.isCoach();
 
 			// create run controller
 			RepositoryEntry courseEntry = userCourseEnv.getCourseEnvironment().getCourseGroupManager().getCourseEntry();

src/main/java/org/olat/course/nodes/OpenMeetingsCourseNode.java

@@ -102,9 +102,8 @@ public class OpenMeetingsCourseNode extends AbstractAccessableCourseNode {
 		updateModuleConfigDefaults(false);
 
 		// check if user is moderator of the virtual classroom
-		CourseGroupManager cgm = userCourseEnv.getCourseEnvironment().getCourseGroupManager();
-		boolean admin = cgm.isIdentityCourseAdministrator(ureq.getIdentity());
-		boolean moderator = admin || cgm.isIdentityAnyCourseCoach(ureq.getIdentity());
+		boolean admin = userCourseEnv.isAdmin();
+		boolean moderator = admin || userCourseEnv.isCoach();
 
 		// create run controller
 		OLATResourceable ores = OresHelper.clone(userCourseEnv.getCourseEnvironment().getCourseGroupManager().getCourseResource());

src/main/java/org/olat/course/nodes/STCourseNode.java

@@ -176,9 +176,8 @@ public class STCourseNode extends AbstractAccessableCourseNode implements Calcul
 					userCourseEnv.getCourseEnvironment().isPreview());
 			// check if user is allowed to edit the page in the run view
 			CourseGroupManager cgm = userCourseEnv.getCourseEnvironment().getCourseGroupManager();
-			boolean hasEditRights = (cgm.isIdentityCourseAdministrator(ureq.getIdentity()) 
-					|| cgm.hasRight(ureq.getIdentity(),CourseRights.RIGHT_COURSEEDITOR))
-					|| (getModuleConfiguration().getBooleanSafe(SPEditController.CONFIG_KEY_ALLOW_COACH_EDIT, false) && cgm.isIdentityCourseCoach(ureq.getIdentity()));
+			boolean hasEditRights = userCourseEnv.isAdmin() || cgm.hasRight(ureq.getIdentity(),CourseRights.RIGHT_COURSEEDITOR)
+					|| (getModuleConfiguration().getBooleanSafe(SPEditController.CONFIG_KEY_ALLOW_COACH_EDIT, false) && userCourseEnv.isCoach());
 			
 			if (hasEditRights) {
 				spCtr.allowPageEditing();

src/main/java/org/olat/course/nodes/ViteroCourseNode.java

@@ -39,7 +39,6 @@ import org.olat.course.condition.ConditionEditController;
 import org.olat.course.editor.CourseEditorEnv;
 import org.olat.course.editor.NodeEditController;
 import org.olat.course.editor.StatusDescription;
-import org.olat.course.groupsandrights.CourseGroupManager;
 import org.olat.course.nodes.vitero.ViteroEditController;
 import org.olat.course.nodes.vitero.ViteroPeekViewController;
 import org.olat.course.run.navigation.NodeRunConstructionResult;
@@ -103,8 +102,7 @@ public class ViteroCourseNode extends AbstractAccessableCourseNode {
 			runCtr = MessageUIFactory.createInfoMessage(ureq, wControl, title, message);
 		} else {
 			// check if user is moderator of the virtual classroom
-			CourseGroupManager cgm = userCourseEnv.getCourseEnvironment().getCourseGroupManager();
-			boolean moderator = cgm.isIdentityCourseAdministrator(ureq.getIdentity());
+			boolean moderator = userCourseEnv.isAdmin();
 			// create run controller
 			Long resourceId = userCourseEnv.getCourseEnvironment().getCourseResourceableId();
 			OLATResourceable ores = OresHelper.createOLATResourceableInstance(CourseModule.class, resourceId);

src/main/java/org/olat/course/nodes/basiclti/LTIRunController.java

@@ -53,7 +53,6 @@ import org.olat.core.util.Encoder;
 import org.olat.core.util.SortedProperties;
 import org.olat.core.util.StringHelper;
 import org.olat.core.util.Util;
-import org.olat.course.groupsandrights.CourseGroupManager;
 import org.olat.course.highscore.ui.HighScoreRunController;
 import org.olat.course.nodes.BasicLTICourseNode;
 import org.olat.course.nodes.CourseNode;
@@ -477,8 +476,7 @@ public class LTIRunController extends BasicController {
 		if (roles.isGuestOnly()) {
 			return "Guest";
 		}
-		CourseGroupManager groupManager = courseEnv.getCourseGroupManager();
-		boolean admin = groupManager.isIdentityCourseAdministrator(getIdentity());
+		boolean admin = userCourseEnv.isAdmin();
 		if(admin) {
 			String authorRole = config.getStringValue(BasicLTICourseNode.CONFIG_KEY_AUTHORROLE);
 			if(StringHelper.containsNonWhitespace(authorRole)) {
@@ -486,7 +484,7 @@ public class LTIRunController extends BasicController {
 			}
 			return "Instructor,Administrator";
 		}
-		boolean coach = groupManager.isIdentityCourseCoach(getIdentity());
+		boolean coach = userCourseEnv.isCoach();
 		if(coach) {
 			String coachRole = config.getStringValue(BasicLTICourseNode.CONFIG_KEY_COACHROLE);
 			if(StringHelper.containsNonWhitespace(coachRole)) {