Merge OpenOLAT 12.4.x to OpenOLAT default with fc0086664588e9bac00abbf8cd66ed0628c2e3e0

src/main/java/org/olat/course/nodes/card2brain/Card2BrainEditController.java

@@ -53,9 +53,12 @@ public class Card2BrainEditController extends ActivateableTabbableDefaultControl
 	private ConditionEditController accessibilityCondContr;
 	private TabbedPane tabPane;
 	
+	private final Card2BrainCourseNode courseNode;
+	
 	public Card2BrainEditController(UserRequest ureq, WindowControl wControl, 
 			Card2BrainCourseNode card2BrainCourseNode, ICourse course, UserCourseEnvironment userCourseEnv) {
 		super(ureq, wControl);
+		this.courseNode = card2BrainCourseNode;
 
 		card2BrainConfigController = new Card2BrainConfigController(ureq, wControl, card2BrainCourseNode.getModuleConfiguration());
 		listenTo(card2BrainConfigController);
@@ -89,7 +92,13 @@ public class Card2BrainEditController extends ActivateableTabbableDefaultControl
 
 	@Override
 	public void event(UserRequest ureq, Controller source, Event event) {
-		if (source == card2BrainConfigController && event.equals(Event.DONE_EVENT)) {
+		if (source == accessibilityCondContr) {
+			if (event == Event.CHANGED_EVENT) {
+				Condition cond = accessibilityCondContr.getCondition();
+				courseNode.setPreConditionAccess(cond);
+				fireEvent(ureq, NodeEditController.NODECONFIG_CHANGED_EVENT);
+			}
+		} else if (source == card2BrainConfigController && event.equals(Event.DONE_EVENT)) {
 			card2BrainConfigController.getUpdatedConfig();
 			fireEvent(ureq, NodeEditController.NODECONFIG_CHANGED_EVENT);
 		}

src/main/java/org/olat/course/nodes/edubase/EdubaseEditController.java

@@ -52,10 +52,13 @@ public class EdubaseEditController extends ActivateableTabbableDefaultController
 	private ConditionEditController accessibilityCondContr;
 	private EdubaseConfigController edubaseConfigController;
 	private EdubaseBookSectionListController edubaseBookSectionListController;
+	
+	private final EdubaseCourseNode courseNode;
 
 	public EdubaseEditController(UserRequest ureq, WindowControl wControl, EdubaseCourseNode edubaseCourseNode,
 			ICourse course, UserCourseEnvironment userCourseEnv) {
 		super(ureq, wControl);
+		this.courseNode = edubaseCourseNode;
 
 		Condition accessCondition = edubaseCourseNode.getPreConditionAccess();
 		accessibilityCondContr = new ConditionEditController(ureq, wControl, userCourseEnv, accessCondition,
@@ -92,7 +95,13 @@ public class EdubaseEditController extends ActivateableTabbableDefaultController
 
 	@Override
 	public void event(UserRequest ureq, Controller source, Event event) {
-		if (source == edubaseConfigController && event.equals(Event.DONE_EVENT)) {
+		if (source == accessibilityCondContr) {
+			if (event == Event.CHANGED_EVENT) {
+				Condition cond = accessibilityCondContr.getCondition();
+				courseNode.setPreConditionAccess(cond);
+				fireEvent(ureq, NodeEditController.NODECONFIG_CHANGED_EVENT);
+			}
+		} else if (source == edubaseConfigController && event.equals(Event.DONE_EVENT)) {
 			edubaseConfigController.getUpdatedConfig();
 			fireEvent(ureq, NodeEditController.NODECONFIG_CHANGED_EVENT);
 			edubaseBookSectionListController.dispatchEvent(ureq, edubaseConfigController, event);