OO-4678: Added dependant rights to module config

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

@@ -37,4 +37,19 @@ public interface RelationRightProvider {
 
 	public String getTranslatedName(Locale locale);
 
+	public enum Order {
+		CourseAndCurriculumRight,
+		CourseProgressAndStatusRight,
+		LecturesAndAbsencesRight,
+		ViewEfficiencyStatementRight,
+		ViewCourseCalendarRight,
+		ResourceAndBookinsRight,
+		ViewGroupMemebershipsRight,
+		ViewAndEditProfileRight,
+		ResetPasswordRight,
+		ContactFormRight,
+		QualityReportAccessRight,
+		CertificateEmailRight,
+		AdministrativePropertiesRight;
+	}
 }

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

@@ -50,7 +50,7 @@ public class CertificateEmailRightProvider implements RelationRightProvider {
 
 	@Override
 	public int getPosition() {
-		return 0;
+		return Order.CertificateEmailRight.ordinal();
 	}
 
 	@Override

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

@@ -44,7 +44,7 @@ public class ViewCourseCalendarRightProvider implements RelationRightProvider {
 
 	@Override
 	public int getPosition() {
-		return 0;
+		return Order.ViewCourseCalendarRight.ordinal();
 	}
 
 	@Override

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

@@ -24,6 +24,8 @@ import java.util.Locale;
 import org.olat.basesecurity.RelationRightProvider;
 import org.olat.core.gui.translator.Translator;
 import org.olat.core.util.Util;
+import org.olat.modules.coach.security.CoursesAndCurriculumRightProvider;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
@@ -35,16 +37,19 @@ import org.springframework.stereotype.Component;
 @Component
 public class ViewEfficiencyStatementRightProvider implements RelationRightProvider {
 
+	@Autowired
+	private CoursesAndCurriculumRightProvider parentRight;
+
 	public static final String RELATION_RIGHT = CourseRightsEnum.viewEfficiencyStatement.name();
 
 	@Override
 	public RelationRightProvider getParent() {
-		return null;
+		return parentRight;
 	}
 
 	@Override
 	public int getPosition() {
-		return 0;
+		return Order.ViewEfficiencyStatementRight.ordinal();
 	}
 
 	@Override

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

@@ -43,7 +43,7 @@ public class AdministrativePropertiesRightProvider implements RelationRightProvi
 
 	@Override
 	public int getPosition() {
-		return 0;
+		return Order.AdministrativePropertiesRight.ordinal();
 	}
 	
 	@Override

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

@@ -48,7 +48,7 @@ public class ContactFormRightProvider implements RelationRightProvider {
 
 	@Override
 	public int getPosition() {
-		return 0;
+		return Order.ContactFormRight.ordinal();
 	}
 
 	@Override

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

@@ -25,6 +25,7 @@ import org.olat.basesecurity.RelationRightProvider;
 import org.olat.core.gui.translator.Translator;
 import org.olat.core.util.Util;
 import org.olat.modules.coach.ui.CoachMainController;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /* 
@@ -33,17 +34,20 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class CourseProgressAndStatusRightProvider implements RelationRightProvider {
-	
-public static final String RELATION_RIGHT = "showCourseProgressAndStatus";
+
+	@Autowired
+	private CoursesAndCurriculumRightProvider parentRight;
+
+	public static final String RELATION_RIGHT = "showCourseProgressAndStatus";
 	
 	@Override
 	public RelationRightProvider getParent() {
-		return null;
+		return parentRight;
 	}
 	
 	@Override
 	public int getPosition() {
-		return 0;
+		return Order.CourseProgressAndStatusRight.ordinal();
 	}
 
 	@Override

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

@@ -43,7 +43,7 @@ public class CoursesAndCurriculumRightProvider implements RelationRightProvider{
 
 	@Override
 	public int getPosition() {
-		return 0;
+		return Order.CourseAndCurriculumRight.ordinal();
 	}
 	
 	@Override

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

@@ -25,6 +25,7 @@ import org.olat.basesecurity.RelationRightProvider;
 import org.olat.core.gui.translator.Translator;
 import org.olat.core.util.Util;
 import org.olat.modules.coach.ui.CoachMainController;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /* 
@@ -33,17 +34,20 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class LecturesAndAbsencesRightProvider implements RelationRightProvider {
-	
+
+	@Autowired
+	private CoursesAndCurriculumRightProvider parentRight;
+
 	public static final String RELATION_RIGHT = "showLecturesAndAbsences";
 	
 	@Override
 	public RelationRightProvider getParent() {
-		return null;
+		return parentRight;
 	}
 
 	@Override
 	public int getPosition() {
-		return 0;
+		return Order.LecturesAndAbsencesRight.ordinal();
 	}
 	
 	@Override

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

@@ -43,7 +43,7 @@ public class ResetPasswordRightProvider implements RelationRightProvider {
 
 	@Override
 	public int getPosition() {
-		return 0;
+		return Order.ResetPasswordRight.ordinal();
 	}
 	
 	@Override

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

@@ -43,7 +43,7 @@ public class ResourcesAndBookingsRightProvider implements RelationRightProvider
 
 	@Override
 	public int getPosition() {
-		return 0;
+		return Order.ResourceAndBookinsRight.ordinal();
 	}
 	
 	@Override

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

@@ -43,7 +43,7 @@ public class ViewAndEditProfileRightProvider implements RelationRightProvider {
 
 	@Override
 	public int getPosition() {
-		return 0;
+		return Order.ViewAndEditProfileRight.ordinal();
 	}
 
 	@Override

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

@@ -43,7 +43,7 @@ public class ViewGroupMembershipsRightProvider implements RelationRightProvider
 
 	@Override
 	public int getPosition() {
-		return 0;
+		return Order.ViewGroupMemebershipsRight.ordinal();
 	}
 	
 	@Override

src/main/java/org/olat/modules/quality/QualityReportAccessRightProvider.java

@@ -45,7 +45,7 @@ public class QualityReportAccessRightProvider implements RelationRightProvider {
 
 	@Override
 	public int getPosition() {
-		return 0;
+		return Order.QualityReportAccessRight.ordinal();
 	}
 	
 	@Override

src/main/java/org/olat/user/ui/role/EditRelationRoleController.java

@@ -19,7 +19,9 @@
  */
 package org.olat.user.ui.role;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -28,15 +30,18 @@ import java.util.stream.Collectors;
 
 import org.olat.basesecurity.IdentityRelationshipService;
 import org.olat.basesecurity.RelationRight;
+import org.olat.basesecurity.RelationRightProvider;
 import org.olat.basesecurity.RelationRole;
 import org.olat.basesecurity.RelationRoleManagedFlag;
 import org.olat.basesecurity.RelationRoleToRight;
 import org.olat.core.gui.UserRequest;
+import org.olat.core.gui.components.form.flexible.FormItem;
 import org.olat.core.gui.components.form.flexible.FormItemContainer;
 import org.olat.core.gui.components.form.flexible.elements.MultipleSelectionElement;
 import org.olat.core.gui.components.form.flexible.elements.SingleSelection;
 import org.olat.core.gui.components.form.flexible.elements.TextElement;
 import org.olat.core.gui.components.form.flexible.impl.FormBasicController;
+import org.olat.core.gui.components.form.flexible.impl.FormEvent;
 import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
 import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.Event;
@@ -61,13 +66,16 @@ public class EditRelationRoleController extends FormBasicController {
 		"", "supervisor", "legalRepresentative", "tutor", "parent",
 		"teacher", "expert", "legalGardian", "employer", "sportsClub"
 	};
+	private static final String INTENDING = "\u00a0"; //   non-breaking space
 	
 	private TextElement roleEl;
 	private SingleSelection predefinedLabelEl;
 	private MultipleSelectionElement rightsEl;
 	
 	private RelationRole relationRole;
-	private List<RelationRight> rights;
+	String[] rightKeys;
+	String[] rightValues;
+	List<RelationRightProvider> rightProviders;
 
 	@Autowired
 	private I18nModule i18nModule;
@@ -75,6 +83,8 @@ public class EditRelationRoleController extends FormBasicController {
 	private I18nManager i18nManager;
 	@Autowired
 	private IdentityRelationshipService identityRelationsService;
+	@Autowired
+	private List<RelationRightProvider> relationRights;
 
 	public EditRelationRoleController(UserRequest ureq, WindowControl wControl) {
 		this(ureq, wControl,null);
@@ -82,8 +92,12 @@ public class EditRelationRoleController extends FormBasicController {
 	
 	public EditRelationRoleController(UserRequest ureq, WindowControl wControl, RelationRole relationRole) {
 		super(ureq, wControl, Util.createPackageTranslator(UserModule.class, ureq.getLocale()));
-		rights = identityRelationsService.getAvailableRights();
 		this.relationRole = relationRole;
+		this.rightKeys = new String[relationRights.size()];
+		this.rightValues = new String[relationRights.size()];
+		this.rightProviders = new ArrayList<>(relationRights.size());
+		this.relationRights.sort(Comparator.comparing(RelationRightProvider::getPosition));
+
 		initForm(ureq);
 	}
 
@@ -104,15 +118,23 @@ public class EditRelationRoleController extends FormBasicController {
 					predefinedLabelKeys, predefinedLabelValues);
 			predefinedLabelEl.select(predefinedLabelKeys[0], true);
 		}
-		
-		String[] rightKeys = new String[rights.size()];
-		String[] rightValues = new String[rights.size()];
-		for(int i=rights.size(); i-->0; ) {
-			rightKeys[i] = rights.get(i).getRight();
-			rightValues[i] = RelationRolesAndRightsUIFactory.getTranslatedRight(rights.get(i), getLocale());
+
+		for(int i=0; i < relationRights.size(); i++) {
+			StringBuilder valueBuilder = new StringBuilder();
+			if (relationRights.get(i).getParent() != null) {
+				for (int k = 6; k-->0;) {
+					valueBuilder.append(INTENDING);
+				}
+			}
+			valueBuilder.append(relationRights.get(i).getTranslatedName(getLocale()));
+			rightKeys[i] = relationRights.get(i).getRight();
+			rightValues[i] = valueBuilder.toString();
+			rightProviders.add(i, relationRights.get(i));
 		}
-		rightsEl = uifactory.addCheckboxesVertical("role.rights", formLayout, rightKeys, rightValues, 2);
+		rightsEl = uifactory.addCheckboxesVertical("role.rights", formLayout, rightKeys, rightValues, 1);
 		rightsEl.setEnabled(!RelationRoleManagedFlag.isManaged(relationRole, RelationRoleManagedFlag.rights));
+		rightsEl.addActionListener(FormEvent.ONCLICK);
+
 		if(relationRole != null) {
 			Set<RelationRoleToRight> roleToRights = relationRole.getRights();
 			for(RelationRoleToRight roleToRight:roleToRights) {
@@ -124,6 +146,8 @@ public class EditRelationRoleController extends FormBasicController {
 				}
 			}	
 		}
+
+		checkDependentRights();
 		
 		FormLayoutContainer buttonsCont = FormLayoutContainer.createButtonLayout("buttons", getTranslator());
 		formLayout.add(buttonsCont);
@@ -136,6 +160,14 @@ public class EditRelationRoleController extends FormBasicController {
 		//
 	}
 
+	@Override
+	protected void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) {
+		if (source == rightsEl) {
+			checkDependentRights();
+		}
+		super.formInnerEvent(ureq, source, event);
+	}
+
 	@Override
 	protected boolean validateFormLogic(UserRequest ureq) {
 		boolean allOk = super.validateFormLogic(ureq);
@@ -152,7 +184,7 @@ public class EditRelationRoleController extends FormBasicController {
 	@Override
 	protected void formOK(UserRequest ureq) {
 		Collection<String> selectedRightKeys = rightsEl.getSelectedKeys();
-		List<RelationRight> selectedRights = rights.stream()
+		List<RelationRight> selectedRights = identityRelationsService.getAvailableRights().stream()
 				.filter(r -> selectedRightKeys.contains(r.getRight())).collect(Collectors.toList());
 		if(relationRole == null) {
 			relationRole = identityRelationsService.createRole(roleEl.getValue(), selectedRights);
@@ -199,4 +231,20 @@ public class EditRelationRoleController extends FormBasicController {
 	protected void formCancelled(UserRequest ureq) {
 		fireEvent(ureq, Event.CANCELLED_EVENT);
 	}
+
+	private void checkDependentRights() {
+		for(int i=0; i < relationRights.size(); i++) {
+			RelationRightProvider rightProvider = rightProviders.get(i);
+
+			if (rightProvider.getParent() != null) {
+				int parentIndex = rightProviders.indexOf(rightProvider.getParent());
+				if (rightsEl.isSelected(parentIndex)) {
+					rightsEl.setEnabled(rightKeys[i], true);
+				} else {
+					rightsEl.setEnabled(rightKeys[i], false);
+					rightsEl.select(rightKeys[i], false);
+				}
+			}
+		}
+	}
 }