Skip to content
Snippets Groups Projects
Commit 602dc643 authored by srosse's avatar srosse
Browse files

Merge remote-tracking branch 'origin/OpenOLAT_14.2'

parents c5ce376f 28b0d86f
No related branches found
No related tags found
No related merge requests found
...@@ -235,7 +235,11 @@ public class IQSELFCourseNode extends AbstractAccessableCourseNode implements Se ...@@ -235,7 +235,11 @@ public class IQSELFCourseNode extends AbstractAccessableCourseNode implements Se
public boolean archiveNodeData(Locale locale, ICourse course, ArchiveOptions options, public boolean archiveNodeData(Locale locale, ICourse course, ArchiveOptions options,
ZipOutputStream exportStream, String archivePath, String charset) { ZipOutputStream exportStream, String archivePath, String charset) {
String repositorySoftKey = (String) getModuleConfiguration().get(IQEditController.CONFIG_KEY_REPOSITORY_SOFTKEY); String repositorySoftKey = (String) getModuleConfiguration().get(IQEditController.CONFIG_KEY_REPOSITORY_SOFTKEY);
RepositoryEntry re = RepositoryManager.getInstance().lookupRepositoryEntryBySoftkey(repositorySoftKey, true); RepositoryEntry re = RepositoryManager.getInstance().lookupRepositoryEntryBySoftkey(repositorySoftKey, false);
if(re == null) {
log.error("Cannot archive course node. Missing repository entry with soft key: ", repositorySoftKey);
return false;
}
try { try {
if(ImsQTI21Resource.TYPE_NAME.equals(re.getOlatResource().getResourceableTypeName())) { if(ImsQTI21Resource.TYPE_NAME.equals(re.getOlatResource().getResourceableTypeName())) {
......
...@@ -291,7 +291,11 @@ public class IQSURVCourseNode extends AbstractAccessableCourseNode implements QT ...@@ -291,7 +291,11 @@ public class IQSURVCourseNode extends AbstractAccessableCourseNode implements QT
ZipOutputStream exportStream, String archivePath, String charset) { ZipOutputStream exportStream, String archivePath, String charset) {
QTIExportManager qem = QTIExportManager.getInstance(); QTIExportManager qem = QTIExportManager.getInstance();
String repositorySoftKey = (String) getModuleConfiguration().get(IQEditController.CONFIG_KEY_REPOSITORY_SOFTKEY); String repositorySoftKey = (String) getModuleConfiguration().get(IQEditController.CONFIG_KEY_REPOSITORY_SOFTKEY);
RepositoryEntry re = RepositoryManager.getInstance().lookupRepositoryEntryBySoftkey(repositorySoftKey, true); RepositoryEntry re = RepositoryManager.getInstance().lookupRepositoryEntryBySoftkey(repositorySoftKey, false);
if(re == null) {
log.error("Cannot archive course node. Missing repository entry with soft key: ", repositorySoftKey);
return false;
}
QTIExportFormatter qef = new QTIExportFormatterCSVType3(locale, null,"\t", "\"", "\r\n", false); QTIExportFormatter qef = new QTIExportFormatterCSVType3(locale, null,"\t", "\"", "\r\n", false);
try { try {
......
...@@ -477,7 +477,12 @@ public class IQTESTCourseNode extends AbstractAccessableCourseNode implements QT ...@@ -477,7 +477,12 @@ public class IQTESTCourseNode extends AbstractAccessableCourseNode implements QT
// 1) prepare result export // 1) prepare result export
CourseEnvironment courseEnv = course.getCourseEnvironment(); CourseEnvironment courseEnv = course.getCourseEnvironment();
try { try {
RepositoryEntry re = RepositoryManager.getInstance().lookupRepositoryEntryBySoftkey(repositorySoftKey, true); RepositoryEntry re = RepositoryManager.getInstance().lookupRepositoryEntryBySoftkey(repositorySoftKey, false);
if(re == null) {
log.error("Cannot archive course node. Missing repository entry with soft key: ", repositorySoftKey);
return false;
}
boolean onyx = QTIResourceTypeModule.isOnyxTest(re.getOlatResource()); boolean onyx = QTIResourceTypeModule.isOnyxTest(re.getOlatResource());
if (onyx) { if (onyx) {
return true; return true;
......
...@@ -572,7 +572,7 @@ webdav.termsfolders.enabled=true ...@@ -572,7 +572,7 @@ webdav.termsfolders.enabled=true
# User agents for which the basic authentication should never be proposed # User agents for which the basic authentication should never be proposed
webdav.basic.authentication.black.list=Microsoft Office Excel,Microsoft Excel,Microsoft-WebDAV-MiniRedir webdav.basic.authentication.black.list=Microsoft Office Excel,Microsoft Excel,Microsoft-WebDAV-MiniRedir
# User agents which don't play nice # User agents which don't play nice
webdav.user.agent.black.list=- webdav.user.agent.black.list=,-
######################################################################## ########################################################################
# Image and PDF scale/thumbnail options # Image and PDF scale/thumbnail options
......
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