Skip to content
Snippets Groups Projects
Commit 4b2cb957 authored by srosse's avatar srosse
Browse files

Merge OpenOLAT 10.4 to OpenOLAT default branch with e9d6a3c6bea90836dfe3f6c6b952e5ee46c9ce9e

parents 9b8be52e 18e1ce24
No related branches found
No related tags found
No related merge requests found
...@@ -132,3 +132,4 @@ cf5d0249c269c1f9b148726907f6bd13f862c153 OpenOLAT 10.4.3 ...@@ -132,3 +132,4 @@ cf5d0249c269c1f9b148726907f6bd13f862c153 OpenOLAT 10.4.3
1bab889e2565cf0443743da51ad98226e8a6ff8e OpenOLAT 10.4.3 1bab889e2565cf0443743da51ad98226e8a6ff8e OpenOLAT 10.4.3
bc8ce641a5620f5717e9a73e31028d41ab7cdc5d OpenOLAT 10.4.4 bc8ce641a5620f5717e9a73e31028d41ab7cdc5d OpenOLAT 10.4.4
d355c6357d0e5aeb25fc978b747824447a214b88 OpenOLAT 10.4.5 d355c6357d0e5aeb25fc978b747824447a214b88 OpenOLAT 10.4.5
fef7f6b2e2628d242e93f86d208f4cfb9c807d7c OpenOLAT 10.4.6
...@@ -23,6 +23,7 @@ import java.util.Date; ...@@ -23,6 +23,7 @@ import java.util.Date;
import org.olat.core.CoreSpringFactory; import org.olat.core.CoreSpringFactory;
import org.olat.core.gui.control.ChiefController; import org.olat.core.gui.control.ChiefController;
import org.olat.core.gui.control.WindowControl;
import org.olat.core.id.OLATResourceable; import org.olat.core.id.OLATResourceable;
import org.olat.course.assessment.AssessmentModeManager; import org.olat.course.assessment.AssessmentModeManager;
import org.olat.course.editor.CourseEditorEnv; import org.olat.course.editor.CourseEditorEnv;
...@@ -60,7 +61,11 @@ public class IsAssessmentModeFunction extends AbstractFunction { ...@@ -60,7 +61,11 @@ public class IsAssessmentModeFunction extends AbstractFunction {
return defaultValue(); return defaultValue();
} }
ChiefController chiefController = getUserCourseEnv().getWindowControl().getWindowBackOffice().getChiefController(); WindowControl wControl = getUserCourseEnv().getWindowControl();
if(wControl == null) {
return ConditionInterpreter.INT_FALSE;
}
ChiefController chiefController = wControl.getWindowBackOffice().getChiefController();
if(chiefController == null) { if(chiefController == null) {
return ConditionInterpreter.INT_FALSE; return ConditionInterpreter.INT_FALSE;
} }
......
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