OO-1971: fix deselect of course element in reused course link panel, clean up...

OO-1971: fix deselect of course element in reused course link panel, clean up callout after a link is clicked

src/main/java/org/olat/commons/calendar/ui/WeeklyCalendarController.java

@@ -351,11 +351,13 @@ public class WeeklyCalendarController extends FormBasicController implements Act
 		} else if (source == eventDetailsCtr) {
 			if(event instanceof CalendarGUIEditEvent) {
 				eventCalloutCtr.deactivate();
+				cleanUp();
 
 				CalendarGUIEditEvent editEvent = (CalendarGUIEditEvent)event;
 				pushEditEventController(ureq, editEvent.getKalendarEvent(), editEvent.getKalendarRenderWrapper());
 			} else if(event == Event.DONE_EVENT) {
 				eventCalloutCtr.deactivate();
+				cleanUp();
 			}
 		} else if(source == printCtrl) {
 			if (event instanceof CalendarGUIPrintEvent) {

src/main/java/org/olat/course/run/calendar/CourseLinkProviderController.java

@@ -76,7 +76,7 @@ public class CourseLinkProviderController extends FormBasicController implements
 		setTranslator(Util.createPackageTranslator(CalendarManager.class, ureq.getLocale(), getTranslator()));
 
 		this.ores = course;
-		availableCourses = new ArrayList<ICourse>(courses);
+		availableCourses = new ArrayList<>(courses);
 		courseNodeTreeModel = new CourseNodeSelectionTreeModel(courses);
 
 		initForm(ureq);
@@ -156,7 +156,10 @@ public class CourseLinkProviderController extends FormBasicController implements
 	@Override
 	public void setKalendarEvent(KalendarEvent kalendarEvent) {
 		this.kalendarEvent = kalendarEvent;
+		//clear all selections
 		clearSelection(courseNodeTreeModel.getRootNode());
+		multiSelectTree.deselectAll();
+		
 		for (KalendarEventLink link: kalendarEvent.getKalendarEventLinks()) {
 			if (link.getProvider().equals(COURSE_LINK_PROVIDER)) {
 				String nodeId = link.getId();