Skip to content
Snippets Groups Projects
Commit 180a914e authored by srosse's avatar srosse
Browse files

OO-4715: wrong session passed to constructor

parent 19e1ec49
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/main/java/org/olat/ims/qti/repository/handlers/QTISurveyHandler.java
+ 14
− 20
View file @ 180a914e
......@@ -45,7 +45,6 @@ import org.olat.core.id.Organisation;
import org.olat.core.id.Roles;
import org.olat.core.logging.AssertException;
import org.olat.core.util.Util;
import org.olat.course.assessment.AssessmentMode;
import org.olat.course.assessment.manager.UserCourseInformationsManager;
import org.olat.course.nodes.iq.IQEditController;
import org.olat.course.nodes.iq.QTIResourceTypeModule;
......@@ -64,7 +63,6 @@ import org.olat.modules.iq.IQSecurityCallback;
import org.olat.repository.RepositoryEntry;
import org.olat.repository.handlers.EditionSupport;
import org.olat.repository.model.RepositoryEntrySecurity;
import org.olat.repository.ui.RepositoryEntryRuntimeController.RuntimeControllerCreator;
import org.olat.resource.OLATResource;
import org.olat.resource.references.Reference;
import org.olat.resource.references.ReferenceManager;
......@@ -165,25 +163,21 @@ public class QTISurveyHandler extends QTIHandler {
@Override
public MainLayoutController createLaunchController(RepositoryEntry re, RepositoryEntrySecurity reSecurity, UserRequest ureq, WindowControl wControl) {
return new QTIRuntimeController(ureq, wControl, re, reSecurity,
new RuntimeControllerCreator() {
@Override
public Controller create(UserRequest uureq, WindowControl wwControl, TooledStackedPanel toolbarPanel,
RepositoryEntry entry, RepositoryEntrySecurity security, AssessmentMode assessmentMode) {
Controller runController;
OLATResource res = entry.getOlatResource();
CoreSpringFactory.getImpl(UserCourseInformationsManager.class)
.updateUserCourseInformations(entry.getOlatResource(), uureq.getIdentity());
if (QTIResourceTypeModule.isOnyxTest(res)) {
Translator trans = Util.createPackageTranslator(IQEditController.class, ureq.getLocale());
runController = MessageUIFactory.createInfoMessage(ureq, wControl, "", trans.translate("error.onyx"));
} else {
Resolver resolver = new ImsRepositoryResolver(entry);
IQSecurityCallback secCallback = new IQPreviewSecurityCallback();
runController = CoreSpringFactory.getImpl(IQManager.class)
.createIQDisplayController(res, resolver, AssessmentInstance.QMD_ENTRY_TYPE_SURVEY, secCallback, uureq, wwControl);
}
return runController;
(uureq, wwControl, toolbarPanel, entry, security, assessmentMode) -> {
Controller runController;
OLATResource res = entry.getOlatResource();
CoreSpringFactory.getImpl(UserCourseInformationsManager.class)
.updateUserCourseInformations(entry.getOlatResource(), uureq.getIdentity());
if (QTIResourceTypeModule.isOnyxTest(res)) {
Translator trans = Util.createPackageTranslator(IQEditController.class, ureq.getLocale());
runController = MessageUIFactory.createInfoMessage(ureq, wControl, "", trans.translate("error.onyx"));
} else {
Resolver resolver = new ImsRepositoryResolver(entry);
IQSecurityCallback secCallback = new IQPreviewSecurityCallback();
runController = CoreSpringFactory.getImpl(IQManager.class)
.createIQDisplayController(res, resolver, AssessmentInstance.QMD_ENTRY_TYPE_SURVEY, secCallback, uureq, wwControl);
}
return runController;
});
}
......
src/main/java/org/olat/ims/qti/repository/handlers/QTITestHandler.java
+ 15
− 21
View file @ 180a914e
......@@ -45,7 +45,6 @@ import org.olat.core.id.Organisation;
import org.olat.core.id.Roles;
import org.olat.core.logging.AssertException;
import org.olat.core.util.Util;
import org.olat.course.assessment.AssessmentMode;
import org.olat.course.assessment.manager.UserCourseInformationsManager;
import org.olat.course.nodes.iq.IQEditController;
import org.olat.course.nodes.iq.QTIResourceTypeModule;
......@@ -64,7 +63,6 @@ import org.olat.modules.iq.IQSecurityCallback;
import org.olat.repository.RepositoryEntry;
import org.olat.repository.handlers.EditionSupport;
import org.olat.repository.model.RepositoryEntrySecurity;
import org.olat.repository.ui.RepositoryEntryRuntimeController.RuntimeControllerCreator;
import org.olat.resource.OLATResource;
import org.olat.resource.references.Reference;
import org.olat.resource.references.ReferenceManager;
......@@ -166,26 +164,22 @@ public class QTITestHandler extends QTIHandler {
@Override
public MainLayoutController createLaunchController(RepositoryEntry re, RepositoryEntrySecurity reSecurity, UserRequest ureq, WindowControl wControl) {
return new QTIRuntimeController(ureq, wControl, re, reSecurity,
new RuntimeControllerCreator() {
@Override
public Controller create(UserRequest uureq, WindowControl wwControl, TooledStackedPanel toolbarPanel,
RepositoryEntry entry, RepositoryEntrySecurity security, AssessmentMode assessmentMode) {
Controller runController;
OLATResource res = entry.getOlatResource();
CoreSpringFactory.getImpl(UserCourseInformationsManager.class)
.updateUserCourseInformations(entry.getOlatResource(), uureq.getIdentity());
if (QTIResourceTypeModule.isOnyxTest(res)) {
Translator trans = Util.createPackageTranslator(IQEditController.class, ureq.getLocale());
runController = MessageUIFactory.createInfoMessage(ureq, wControl, "", trans.translate("error.onyx"));
} else {
Resolver resolver = new ImsRepositoryResolver(entry);
IQSecurityCallback secCallback = new IQPreviewSecurityCallback();
runController = CoreSpringFactory.getImpl(IQManager.class)
.createIQDisplayController(res, resolver, AssessmentInstance.QMD_ENTRY_TYPE_SELF, secCallback, uureq, wwControl);
}
return runController;
(uureq, wwControl, toolbarPanel, entry, security, assessmentMode) -> {
Controller runController;
OLATResource res = entry.getOlatResource();
CoreSpringFactory.getImpl(UserCourseInformationsManager.class)
.updateUserCourseInformations(entry.getOlatResource(), uureq.getIdentity());
if (QTIResourceTypeModule.isOnyxTest(res)) {
Translator trans = Util.createPackageTranslator(IQEditController.class, uureq.getLocale());
runController = MessageUIFactory.createInfoMessage(uureq, wwControl, "", trans.translate("error.onyx"));
} else {
Resolver resolver = new ImsRepositoryResolver(entry);
IQSecurityCallback secCallback = new IQPreviewSecurityCallback();
runController = CoreSpringFactory.getImpl(IQManager.class)
.createIQDisplayController(res, resolver, AssessmentInstance.QMD_ENTRY_TYPE_SELF, secCallback, uureq, wwControl);
}
});
return runController;
});
}
@Override
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment