Skip to content
Snippets Groups Projects
Commit 6aa9d4e3 authored by srosse's avatar srosse
Browse files

Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_13.1

parents 18b575f9 472d7be9
No related branches found
No related tags found
No related merge requests found
...@@ -51,6 +51,8 @@ public class CalendarWSHelper { ...@@ -51,6 +51,8 @@ public class CalendarWSHelper {
kalEvent.setLocation(event.getLocation()); kalEvent.setLocation(event.getLocation());
kalEvent.setManagedFlags(CalendarManagedFlag.toEnum(event.getManagedFlags())); kalEvent.setManagedFlags(CalendarManagedFlag.toEnum(event.getManagedFlags()));
kalEvent.setAllDayEvent(event.isAllDayEvent()); kalEvent.setAllDayEvent(event.isAllDayEvent());
kalEvent.setExternalId(event.getExternalId());
kalEvent.setExternalSource(event.getExternalSource());
} }
protected static boolean hasReadAccess(KalendarRenderWrapper wrapper) { protected static boolean hasReadAccess(KalendarRenderWrapper wrapper) {
......
...@@ -441,11 +441,13 @@ public class AssessmentTestComposerController extends MainLayoutBasicController ...@@ -441,11 +441,13 @@ public class AssessmentTestComposerController extends MainLayoutBasicController
AssessmentTestEvent ate = (AssessmentTestEvent)event; AssessmentTestEvent ate = (AssessmentTestEvent)event;
if(ate == AssessmentTestEvent.ASSESSMENT_TEST_CHANGED_EVENT) { if(ate == AssessmentTestEvent.ASSESSMENT_TEST_CHANGED_EVENT) {
AssessmentTest ast = assessmentTestBuilder.getAssessmentTest(); AssessmentTest ast = assessmentTestBuilder.getAssessmentTest();
assessmentChanged(ureq);
doUpdate(ast.getIdentifier(), ast.getTitle()); doUpdate(ast.getIdentifier(), ast.getTitle());
} }
} else if(event instanceof AssessmentTestPartEvent) { } else if(event instanceof AssessmentTestPartEvent) {
AssessmentTestPartEvent atpe = (AssessmentTestPartEvent)event; AssessmentTestPartEvent atpe = (AssessmentTestPartEvent)event;
if(atpe == AssessmentTestPartEvent.ASSESSMENT_TEST_PART_CHANGED_EVENT) { if(atpe == AssessmentTestPartEvent.ASSESSMENT_TEST_PART_CHANGED_EVENT) {
assessmentChanged(ureq);
doSaveAssessmentTest(ureq, null); doSaveAssessmentTest(ureq, null);
} }
} else if(event instanceof AssessmentSectionEvent) { } else if(event instanceof AssessmentSectionEvent) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment