OO-4678: Advanced rights for user relation role

pom.xml

@@ -1350,7 +1350,15 @@
 					</execution>
 				</executions>
 			</plugin>
-		</plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>10</source>
+                    <target>10</target>
+                </configuration>
+            </plugin>
+        </plugins>
 		<pluginManagement>
 			<plugins>
 				<!-- OLAT requires JDK 1.8 or later ! -->

src/main/java/org/olat/admin/user/UserShortDescription.java

@@ -38,7 +38,7 @@ import org.olat.core.gui.control.controller.BasicController;
 import org.olat.core.id.Identity;
 import org.olat.core.id.Roles;
 import org.olat.core.id.UserConstants;
-import org.olat.modules.coach.ui.UserRelationOverviewController;
+import org.olat.modules.coach.ui.UserOverviewController;
 import org.olat.user.UserManager;
 import org.olat.user.propertyhandlers.UserPropertyHandler;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -79,7 +79,7 @@ public class UserShortDescription extends BasicController {
 	public UserShortDescription(UserRequest ureq, WindowControl wControl, Identity identity, boolean isAdministrativeUser) {
 		super(ureq, wControl);
 
-		initProperties(UserRelationOverviewController.usageIdentifier, identity, isAdministrativeUser, true, null);
+		initProperties(UserOverviewController.usageIdentifier, identity, isAdministrativeUser, true, null);
 	}
 
 	private void initProperties(String identifier, Identity identity, boolean isAdministrativeUser, boolean usernameOnTop, Rows additionalRows) {

src/main/java/org/olat/admin/user/_content/userShortDescription.html

 <div class="o_userShortDescription" id="$r.getCId()">
 <table class="table table-bordered table-condensed table-striped">
-	#if($r.isNotNull($usernamePosition) && $usernamePosition == "top")
+	#if($r.isNotNull($identityKey) && $r.isNotNull($usernamePosition) && $usernamePosition == "top")
 		#if($r.isNotNull($username))
 		<tr class="o_prop o_username">
 			<th scope="row">$usernameLabel</th>
@@ -20,7 +20,7 @@
 		</tr>
 		#end
 	#end
-	#if($r.isNotNull($usernamePosition) && $usernamePosition == "bottom")
+	#if($r.isNotNull($identityKey) && $r.isNotNull($usernamePosition) && $usernamePosition == "bottom")
 		#if($r.isNotNull($username))
 		<tr class="o_prop o_username">
 			<th scope="row">$usernameLabel</th>

src/main/java/org/olat/basesecurity/IdentityRelationshipService.java

@@ -50,7 +50,9 @@ public interface IdentityRelationshipService {
 	
 	public List<RelationRight> getAvailableRights();
 	
-	public RelationRightProvider getRelationRightProvider(RelationRight right);
+	public RightProvider getRelationRightProvider(RelationRight right);
+
+	public List<RightProvider> getAvailableRightProviders();
 	
 	public boolean isInUse(RelationRole relationRole);
 	

src/main/java/org/olat/basesecurity/RelationRight.java

@@ -32,5 +32,4 @@ public interface RelationRight extends CreateInfo {
 	public Long getKey();
 	
 	public String getRight();
-
 }

src/main/java/org/olat/basesecurity/manager/IdentityRelationshipServiceImpl.java

@@ -20,7 +20,10 @@
 package org.olat.basesecurity.manager;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
 
 import javax.annotation.PostConstruct;
 
@@ -29,7 +32,7 @@ import org.olat.basesecurity.IdentityRelationshipService;
 import org.olat.basesecurity.IdentityToIdentityRelation;
 import org.olat.basesecurity.IdentityToIdentityRelationManagedFlag;
 import org.olat.basesecurity.RelationRight;
-import org.olat.basesecurity.RelationRightProvider;
+import org.olat.basesecurity.RightProvider;
 import org.olat.basesecurity.RelationRole;
 import org.olat.basesecurity.RelationRoleManagedFlag;
 import org.olat.basesecurity.RelationSearchParams;
@@ -54,11 +57,11 @@ public class IdentityRelationshipServiceImpl implements IdentityRelationshipServ
 	private IdentityToIdentityRelationDAO identityRelationshipDao;
 	
 	@Autowired
-	private List<RelationRightProvider> relationRightProviders;
+	private List<RightProvider> allRights;
 	
 	@PostConstruct
 	void ensureRightsExists() {
-		for (RelationRightProvider relationRightProvider : relationRightProviders) {
+		for (RightProvider relationRightProvider : allRights) {
 			relationRightDao.ensureRightExists(relationRightProvider.getRight());
 		}
 	}
@@ -70,7 +73,7 @@ public class IdentityRelationshipServiceImpl implements IdentityRelationshipServ
 	
 	@Override
 	public RelationRole createRole(String role, List<RelationRight> rights) {
-		RelationRole relationRole = relationRoleDao.createRelationRole(role, null, null, null);
+		RelationRole relationRole = relationRoleDao.createRelationRole(role, null, null, null, true);
 		if(rights != null && !rights.isEmpty()) {
 			relationRoleDao.setRights(relationRole, rights);
 		}
@@ -80,7 +83,7 @@ public class IdentityRelationshipServiceImpl implements IdentityRelationshipServ
 	@Override
 	public RelationRole createRole(String role, String externalId, String externalRef,
 			RelationRoleManagedFlag[] managedFlags, List<RelationRight> rights) {
-		RelationRole relationRole = relationRoleDao.createRelationRole(role, externalId, externalRef, managedFlags);
+		RelationRole relationRole = relationRoleDao.createRelationRole(role, externalId, externalRef, managedFlags, true);
 		if(rights != null && !rights.isEmpty()) {
 			relationRoleDao.setRights(relationRole, rights);
 		}
@@ -112,12 +115,15 @@ public class IdentityRelationshipServiceImpl implements IdentityRelationshipServ
 
 	@Override
 	public List<RelationRight> getAvailableRights() {
-		return relationRightDao.loadRelationRights();
+		List<RelationRight> relationRights = relationRightDao.loadRelationRights();
+		List<String> relationRightStrings = allRights.stream().filter(RightProvider::isUserRelationsRight).map(RightProvider::getRight).collect(Collectors.toList());
+
+		return relationRights.stream().filter(right -> relationRightStrings.contains(right.getRight())).collect(Collectors.toList());
 	}
 
 	@Override
-	public RelationRightProvider getRelationRightProvider(RelationRight right) {
-		for (RelationRightProvider provider : relationRightProviders) {
+	public RightProvider getRelationRightProvider(RelationRight right) {
+		for (RightProvider provider : allRights) {
 			if (provider.getRight().equals(right.getRight())) {
 				return provider;
 			}
@@ -125,6 +131,14 @@ public class IdentityRelationshipServiceImpl implements IdentityRelationshipServ
 		return null;
 	}
 
+	@Override
+	public List<RightProvider> getAvailableRightProviders() {
+		return getAvailableRights().stream().map(this::getRelationRightProvider)
+				.filter(Objects::nonNull)
+				.sorted(Comparator.comparing(RightProvider::getUserRelationsPosition))
+				.collect(Collectors.toList());
+	}
+
 	@Override
 	public boolean isInUse(RelationRole relationRole) {
 		return identityRelationshipDao.isUsed(relationRole);

src/main/java/org/olat/basesecurity/manager/RelationRightDAO.java

@@ -89,5 +89,4 @@ public class RelationRightDAO {
 
 		dbInstance.commitAndCloseSession();
 	}
-
 }

src/main/java/org/olat/basesecurity/manager/RelationRoleDAO.java

@@ -47,7 +47,7 @@ public class RelationRoleDAO {
 	@Autowired
 	private DB dbInstance;
 	
-	public RelationRole createRelationRole(String role, String externalId, String externalRef, RelationRoleManagedFlag[] flags) {
+	public RelationRole createRelationRole(String role, String externalId, String externalRef, RelationRoleManagedFlag[] flags, boolean userToUserRoleOnly) {
 		RelationRoleImpl relationRole = new RelationRoleImpl();
 		relationRole.setCreationDate(new Date());
 		relationRole.setLastModified(relationRole.getCreationDate());

src/main/java/org/olat/course/certificate/CertificateEmailRightProvider.java

@@ -19,9 +19,12 @@
  */
 package org.olat.course.certificate;
 
+import java.util.Collection;
+import java.util.Collections;
 import java.util.Locale;
 
-import org.olat.basesecurity.RelationRightProvider;
+import org.olat.basesecurity.OrganisationRoles;
+import org.olat.basesecurity.RightProvider;
 import org.olat.core.gui.translator.Translator;
 import org.olat.core.util.Util;
 import org.olat.course.certificate.ui.CertificateController;
@@ -34,7 +37,7 @@ import org.springframework.stereotype.Component;
  *
  */
 @Component
-public class CertificateEmailRightProvider implements RelationRightProvider {
+public class CertificateEmailRightProvider implements RightProvider {
 
 	public static final String RELATION_RIGHT = "certificateEmail";
 
@@ -44,13 +47,28 @@ public class CertificateEmailRightProvider implements RelationRightProvider {
 	}
 
 	@Override
-	public RelationRightProvider getParent() {
+	public RightProvider getParent() {
 		return null;
 	}
 
 	@Override
-	public int getPosition() {
-		return Order.CertificateEmailRight.ordinal();
+	public boolean isUserRelationsRight() {
+		return true;
+	}
+
+	@Override
+	public int getUserRelationsPosition() {
+		return UserRelationRightsOrder.CertificateEmailRight.ordinal();
+	}
+
+	@Override
+	public Collection<OrganisationRoles> getOrganisationRoles() {
+		return Collections.emptyList();
+	}
+
+	@Override
+	public int getOrganisationPosition() {
+		return -1;
 	}
 
 	@Override

src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementListController.java

@@ -49,6 +49,7 @@ import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.Event;
 import org.olat.core.gui.control.WindowControl;
 import org.olat.core.gui.control.generic.closablewrapper.CloseableModalController;
+import org.olat.core.gui.control.generic.dtabs.Activateable2;
 import org.olat.core.gui.control.generic.modal.DialogBoxController;
 import org.olat.core.gui.control.generic.modal.DialogBoxUIFactory;
 import org.olat.core.gui.render.Renderer;
@@ -56,6 +57,8 @@ import org.olat.core.gui.render.StringOutput;
 import org.olat.core.gui.render.URLBuilder;
 import org.olat.core.gui.translator.Translator;
 import org.olat.core.id.Identity;
+import org.olat.core.id.context.ContextEntry;
+import org.olat.core.id.context.StateEntry;
 import org.olat.core.util.StringHelper;
 import org.olat.core.util.Util;
 import org.olat.core.util.coordinate.CoordinatorManager;
@@ -87,14 +90,13 @@ import org.springframework.beans.factory.annotation.Autowired;
  * @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
  *
  */
-public class CertificateAndEfficiencyStatementListController extends FormBasicController
-		implements BreadcrumbPanelAware, GenericEventListener {
+public class CertificateAndEfficiencyStatementListController extends FormBasicController implements BreadcrumbPanelAware, GenericEventListener, Activateable2 {
 	
 	private static final String CMD_SHOW = "cmd.show";
 	private static final String CMD_LAUNCH_COURSE = "cmd.launch.course";
 	private static final String CMD_DELETE = "cmd.delete";
 	private static final String CMD_MEDIA = "cmd.MEDIA";
-	
+
 	private FlexiTableElement tableEl;
 	private BreadcrumbPanel stackPanel;
 	private FormLink coachingToolButton;
@@ -128,27 +130,35 @@ public class CertificateAndEfficiencyStatementListController extends FormBasicCo
 		this(ureq, wControl, ureq.getUserSession().getIdentity(), false, true, true);
 	}
 	
-	public CertificateAndEfficiencyStatementListController(UserRequest ureq, WindowControl wControl,
-			Identity assessedIdentity, boolean linkToCoachingTool, boolean canModify, boolean canLaunchCourse) {
+	public CertificateAndEfficiencyStatementListController(UserRequest ureq, WindowControl wControl, Identity assessedIdentity, boolean linkToCoachingTool, boolean canModify, boolean canLaunchCourse) {
 		super(ureq, wControl, "cert_statement_list");
 		setTranslator(Util.createPackageTranslator(AssessmentModule.class, getLocale(), getTranslator()));
 		this.canModify = canModify;
 		this.assessedIdentity = assessedIdentity;
 		this.linkToCoachingTool = linkToCoachingTool;
 		this.canLaunchCourse = canLaunchCourse;
+
+		// Show heading
+		flc.contextPut("showHeading", true);
 		
 		initForm(ureq);
 		
 		CoordinatorManager.getInstance().getCoordinator().getEventBus()
 			.registerFor(this, getIdentity(), CertificatesManager.ORES_CERTIFICATE_EVENT);
 	}
+
+	public CertificateAndEfficiencyStatementListController(UserRequest ureq, WindowControl wControl, Identity assessedIdentity, boolean linkToCoachingTool, boolean canModify, boolean canLaunchCourse, boolean showHeading) {
+		this(ureq, wControl, assessedIdentity, linkToCoachingTool, canModify, canLaunchCourse);
+
+		// Set visibility of heading
+		flc.contextPut("showHeading", showHeading);
+	}
 	
-	public CertificateAndEfficiencyStatementListController(UserRequest ureq, WindowControl wControl,
-			Identity assessedIdentity, boolean useFieldSet) {
-		this(ureq, wControl, assessedIdentity, false, false, false);
+	public CertificateAndEfficiencyStatementListController(UserRequest ureq, WindowControl wControl, Identity assessedIdentity, boolean withFieldSet) {
+		this(ureq, wControl, assessedIdentity, false, false, true);
 		
-		// Show different header in user relations
-		flc.contextPut("withFieldSet", useFieldSet);
+		// Show different header in user management
+		flc.contextPut("withFieldSet", withFieldSet);
 	}
 	
 	@Override
@@ -226,6 +236,7 @@ public class CertificateAndEfficiencyStatementListController extends FormBasicCo
 		loadModel();
 		tableEl = uifactory.addTableElement(getWindowControl(), "certificates", tableModel, getTranslator(), formLayout);
 		tableEl.setElementCssClass("o_sel_certificates_table");
+		tableEl.setEmtpyTableMessageKey("table.statements.empty");
 	}
 	
 	private void loadModel() {
@@ -406,6 +417,11 @@ public class CertificateAndEfficiencyStatementListController extends FormBasicCo
 		cmc.activate();
 	}
 
+	@Override
+	public void activate(UserRequest ureq, List<ContextEntry> entries, StateEntry state) {
+
+	}
+
 	public class AsArtefactCellRenderer implements FlexiCellRenderer {
 		
 		@Override

src/main/java/org/olat/course/certificate/ui/_content/cert_statement_list.html

@@ -14,6 +14,8 @@
 </fieldset>
 #else
 ## in users home
-<h2 ><i class="o_icon o_icon o_icon-fw o_icon_certificate"> </i>$r.translate("certificates.and.statements.title")</h2>
-$r.render("certificates")
+	#if($showHeading)
+	<h2 ><i class="o_icon o_icon o_icon-fw o_icon_certificate"> </i>$r.translate("certificates.and.statements.title")</h2>
+	#end
+	$r.render("certificates")
 #end

src/main/java/org/olat/course/certificate/ui/_i18n/LocalStrings_de.properties

@@ -19,6 +19,7 @@ completion=$org.olat.modules.assessment.ui\:learning.progress
 confirm.delete.title=Zertifikate l\u00F6schen
 confirm.delete.text=Wollen Sie dieses Zertifikat wirklich l\u00F6schen?
 table.header.certificate=Zertifikat
+table.statements.empty=Keine Leistungsnachweise oder Zertifikate vorhanden
 choose.title=Vorlage ausw\u00E4hlen
 default.template=Standardvorlage
 details.certificate=Zertifikat
@@ -73,4 +74,4 @@ confirm.certificate.deleted=Das Zertifikat vom {0} wurde gel\u00F6scht.
 certificates.wizard.title=Zertifikate erstellen
 certificates.wizard.select=Benutzer ausw\u00E4hlen
 certificates.wizard.overview=\u00DCbersicht
-msg.certificate.pending=Das Zertifikat wird in ein paar Sekunden erstellt.
+msg.certificate.pending=Das Zertifikat wird in ein paar Sekunden erstellt.
\ No newline at end of file

src/main/java/org/olat/course/certificate/ui/_i18n/LocalStrings_en.properties

@@ -64,6 +64,7 @@ recertification.week=Week
 recertification.year=Year
 replace=Replace
 relation.right.email=Copy of certificates per E-Mail
+table.statements.empty=No statements or certificates available
 table.header.certificate=Certificate
 template.file=File
 template.name=Name

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

@@ -21,7 +21,7 @@ package org.olat.course.groupsandrights;
 
 import java.util.Locale;
 
-import org.olat.basesecurity.RelationRightProvider;
+import org.olat.basesecurity.RightProvider;
 import org.olat.core.gui.translator.Translator;
 import org.olat.core.util.Util;
 import org.springframework.stereotype.Component;
@@ -33,23 +33,33 @@ import org.springframework.stereotype.Component;
  *
  */
 @Component
-public class ViewCourseCalendarRightProvider implements RelationRightProvider {
+public class ViewCourseCalendarRightProvider implements RightProvider {
 
 	public static final String RELATION_RIGHT = CourseRightsEnum.viewCourseCalendar.name();
 
 	@Override
-	public RelationRightProvider getParent() {
+	public String getRight() {
+		return RELATION_RIGHT;
+	}
+
+	@Override
+	public RightProvider getParent() {
 		return null;
 	}
 
 	@Override
-	public int getPosition() {
-		return Order.ViewCourseCalendarRight.ordinal();
+	public boolean isUserRelationsRight() {
+		return true;
 	}
 
 	@Override
-	public String getRight() {
-		return RELATION_RIGHT;
+	public int getUserRelationsPosition() {
+		return UserRelationRightsOrder.ViewCourseCalendarRight.ordinal();
+	}
+
+	@Override
+	public int getOrganisationPosition() {
+		return OrganisationRightsOrder.ViewCourseCalendarRight.ordinal();
 	}
 
 	@Override

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

@@ -21,7 +21,7 @@ package org.olat.course.groupsandrights;
 
 import java.util.Locale;
 
-import org.olat.basesecurity.RelationRightProvider;
+import org.olat.basesecurity.RightProvider;
 import org.olat.core.gui.translator.Translator;
 import org.olat.core.util.Util;
 import org.olat.modules.coach.security.CoursesAndCurriculumRightProvider;
@@ -35,7 +35,7 @@ import org.springframework.stereotype.Component;
  *
  */
 @Component
-public class ViewEfficiencyStatementRightProvider implements RelationRightProvider {
+public class ViewEfficiencyStatementRightProvider implements RightProvider {
 
 	@Autowired
 	private CoursesAndCurriculumRightProvider parentRight;
@@ -43,18 +43,28 @@ public class ViewEfficiencyStatementRightProvider implements RelationRightProvid
 	public static final String RELATION_RIGHT = CourseRightsEnum.viewEfficiencyStatement.name();
 
 	@Override
-	public RelationRightProvider getParent() {
+	public String getRight() {
+		return RELATION_RIGHT;
+	}
+
+	@Override
+	public RightProvider getParent() {
 		return parentRight;
 	}
 
 	@Override
-	public int getPosition() {
-		return Order.ViewEfficiencyStatementRight.ordinal();
+	public boolean isUserRelationsRight() {
+		return true;
 	}
 
 	@Override
-	public String getRight() {
-		return RELATION_RIGHT;
+	public int getUserRelationsPosition() {
+		return UserRelationRightsOrder.ViewEfficiencyStatementRight.ordinal();
+	}
+
+	@Override
+	public int getOrganisationPosition() {
+		return OrganisationRightsOrder.ViewEfficiencyStatementRight.ordinal();
 	}
 
 	@Override

src/main/java/org/olat/modules/coach/security/AdministrativePropertiesRightProvider.java

@@ -21,7 +21,7 @@ package org.olat.modules.coach.security;
 
 import java.util.Locale;
 
-import org.olat.basesecurity.RelationRightProvider;
+import org.olat.basesecurity.RightProvider;
 import org.olat.core.gui.translator.Translator;
 import org.olat.core.util.Util;
 import org.olat.modules.coach.ui.CoachMainController;
@@ -32,23 +32,33 @@ import org.springframework.stereotype.Component;
  * @author aboeckle, alexander.boeckle@frentix.com
  */
 @Component
-public class AdministrativePropertiesRightProvider implements RelationRightProvider {
+public class AdministrativePropertiesRightProvider implements RightProvider {
 
 	public static final String RELATION_RIGHT = "showAdministrativeProperties";
-	
+
+	@Override
+	public String getRight() {
+		return RELATION_RIGHT;
+	}
+
 	@Override
-	public RelationRightProvider getParent() {
+	public RightProvider getParent() {
 		return null;
 	}
 
 	@Override
-	public int getPosition() {
-		return Order.AdministrativePropertiesRight.ordinal();
+	public boolean isUserRelationsRight() {
+		return true;
 	}
-	
+
 	@Override
-	public String getRight() {
-		return RELATION_RIGHT;
+	public int getUserRelationsPosition() {
+		return UserRelationRightsOrder.AdministrativePropertiesRight.ordinal();
+	}
+
+	@Override
+	public int getOrganisationPosition() {
+		return OrganisationRightsOrder.AdministrativePropertiesRight.ordinal();
 	}
 
 	@Override

src/main/java/org/olat/modules/coach/security/ContactFormRightProvider.java

@@ -21,7 +21,7 @@ package org.olat.modules.coach.security;
 
 import java.util.Locale;
 
-import org.olat.basesecurity.RelationRightProvider;
+import org.olat.basesecurity.RightProvider;
 import org.olat.core.gui.translator.Translator;
 import org.olat.core.util.Util;
 import org.olat.modules.coach.ui.CoachMainController;
@@ -32,7 +32,7 @@ import org.springframework.stereotype.Component;
  * @author aboeckle, alexander.boeckle@frentix.com
  */
 @Component
-public class ContactFormRightProvider implements RelationRightProvider {
+public class ContactFormRightProvider implements RightProvider {
 
 	public static final String RELATION_RIGHT = "showContactform";
 	
@@ -42,13 +42,23 @@ public class ContactFormRightProvider implements RelationRightProvider {
 	}
 	
 	@Override
-	public RelationRightProvider getParent() {
+	public RightProvider getParent() {
 		return null;
 	}
 
 	@Override
-	public int getPosition() {
-		return Order.ContactFormRight.ordinal();
+	public boolean isUserRelationsRight() {
+		return true;
+	}
+
+	@Override
+	public int getUserRelationsPosition() {
+		return UserRelationRightsOrder.ContactFormRight.ordinal();
+	}
+
+	@Override
+	public int getOrganisationPosition() {
+		return OrganisationRightsOrder.ContactFormRight.ordinal();
 	}
 
 	@Override

src/main/java/org/olat/modules/coach/security/CourseProgressAndStatusRightProvider.java

@@ -21,7 +21,7 @@ package org.olat.modules.coach.security;
 
 import java.util.Locale;
 
-import org.olat.basesecurity.RelationRightProvider;
+import org.olat.basesecurity.RightProvider;
 import org.olat.core.gui.translator.Translator;
 import org.olat.core.util.Util;
 import org.olat.modules.coach.ui.CoachMainController;
@@ -33,26 +33,36 @@ import org.springframework.stereotype.Component;
  * @author aboeckle, alexander.boeckle@frentix.com
  */
 @Component
-public class CourseProgressAndStatusRightProvider implements RelationRightProvider {
+public class CourseProgressAndStatusRightProvider implements RightProvider {
 
 	@Autowired
 	private CoursesAndCurriculumRightProvider parentRight;
 
 	public static final String RELATION_RIGHT = "showCourseProgressAndStatus";
-	
+
+	@Override
+	public String getRight() {
+		return RELATION_RIGHT;
+	}
+
 	@Override
-	public RelationRightProvider getParent() {
+	public RightProvider getParent() {
 		return parentRight;
 	}
-	
+
 	@Override
-	public int getPosition() {
-		return Order.CourseProgressAndStatusRight.ordinal();
+	public boolean isUserRelationsRight() {
+		return true;
 	}
 
 	@Override
-	public String getRight() {
-		return RELATION_RIGHT;
+	public int getUserRelationsPosition() {
+		return UserRelationRightsOrder.CourseProgressAndStatusRight.ordinal();
+	}
+
+	@Override
+	public int getOrganisationPosition() {
+		return OrganisationRightsOrder.CourseProgressAndStatusRight.ordinal();
 	}
 
 	@Override

src/main/java/org/olat/modules/coach/security/CoursesAndCurriculumRightProvider.java

@@ -21,7 +21,7 @@ package org.olat.modules.coach.security;
 
 import java.util.Locale;
 
-import org.olat.basesecurity.RelationRightProvider;
+import org.olat.basesecurity.RightProvider;
 import org.olat.core.gui.translator.Translator;
 import org.olat.core.util.Util;
 import org.olat.modules.coach.ui.CoachMainController;
@@ -32,23 +32,33 @@ import org.springframework.stereotype.Component;
  * @author aboeckle, alexander.boeckle@frentix.com
  */
 @Component
-public class CoursesAndCurriculumRightProvider implements RelationRightProvider{
+public class CoursesAndCurriculumRightProvider implements RightProvider {
 	
 	public static final String RELATION_RIGHT = "showCoursesAndCurriculum";
-	
+
+	@Override
+	public String getRight() {
+		return RELATION_RIGHT;
+	}
+
 	@Override
-	public RelationRightProvider getParent() {
+	public RightProvider getParent() {
 		return null;
 	}
 
 	@Override
-	public int getPosition() {
-		return Order.CourseAndCurriculumRight.ordinal();
+	public boolean isUserRelationsRight() {
+		return true;
 	}
-	
+
 	@Override
-	public String getRight() {
-		return RELATION_RIGHT;
+	public int getUserRelationsPosition() {
+		return UserRelationRightsOrder.CourseAndCurriculumRight.ordinal();
+	}
+
+	@Override
+	public int getOrganisationPosition() {
+		return OrganisationRightsOrder.CourseAndCurriculumRight.ordinal();
 	}
 
 	@Override

src/main/java/org/olat/modules/coach/security/LecturesAndAbsencesRightProvider.java

@@ -21,7 +21,7 @@ package org.olat.modules.coach.security;
 
 import java.util.Locale;
 
-import org.olat.basesecurity.RelationRightProvider;
+import org.olat.basesecurity.RightProvider;
 import org.olat.core.gui.translator.Translator;
 import org.olat.core.util.Util;
 import org.olat.modules.coach.ui.CoachMainController;
@@ -33,26 +33,36 @@ import org.springframework.stereotype.Component;
  * @author aboeckle, alexander.boeckle@frentix.com
  */
 @Component
-public class LecturesAndAbsencesRightProvider implements RelationRightProvider {
+public class LecturesAndAbsencesRightProvider implements RightProvider {
 
 	@Autowired
 	private CoursesAndCurriculumRightProvider parentRight;
 
 	public static final String RELATION_RIGHT = "showLecturesAndAbsences";
-	
+
+	@Override
+	public String getRight() {
+		return RELATION_RIGHT;
+	}
+
 	@Override
-	public RelationRightProvider getParent() {
+	public RightProvider getParent() {
 		return parentRight;
 	}
 
 	@Override
-	public int getPosition() {
-		return Order.LecturesAndAbsencesRight.ordinal();
+	public boolean isUserRelationsRight() {
+		return true;
 	}
-	
+
 	@Override
-	public String getRight() {
-		return RELATION_RIGHT;
+	public int getUserRelationsPosition() {
+		return UserRelationRightsOrder.LecturesAndAbsencesRight.ordinal();
+	}
+
+	@Override
+	public int getOrganisationPosition() {
+		return OrganisationRightsOrder.LecturesAndAbsencesRight.ordinal();
 	}
 
 	@Override