diff --git a/src/main/java/org/olat/admin/sysinfo/LargeFilesController.java b/src/main/java/org/olat/admin/sysinfo/LargeFilesController.java
index 44a328014955a5a781ccf8a90d4924794e0a3113..c13b68c584bed87516fcf103fc91d14bd9b6cd2f 100644
--- a/src/main/java/org/olat/admin/sysinfo/LargeFilesController.java
+++ b/src/main/java/org/olat/admin/sysinfo/LargeFilesController.java
@@ -79,6 +79,7 @@ import org.olat.core.util.StringHelper;
import org.olat.core.util.mail.ContactList;
import org.olat.core.util.mail.ContactMessage;
import org.olat.modules.co.ContactFormController;
+import org.olat.user.ui.UserDisplayNameCellRenderer;
import org.springframework.beans.factory.annotation.Autowired;
@@ -215,9 +216,7 @@ public class LargeFilesController extends FormBasicController implements Extende
}
}
- Collections.sort(rows, (row1,row2) -> {
- return row2.getSize().intValue() - row1.getSize().intValue();
- });
+ Collections.sort(rows, (row1, row2) -> (row2.getSize().intValue() - row1.getSize().intValue()));
if(maxResults != 0 && maxResults < rows.size()) {
rows = rows.subList(0, maxResults);
@@ -332,7 +331,9 @@ public class LargeFilesController extends FormBasicController implements Extende
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, LargeFilesTableColumns.fileType));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, LargeFilesTableColumns.downloadCount));
- columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, LargeFilesTableColumns.author, "selectAuthor"));
+ DefaultFlexiColumnModel authorModel = new DefaultFlexiColumnModel(false, LargeFilesTableColumns.author, "selectAuthor");
+ authorModel.setCellRenderer(UserDisplayNameCellRenderer.get());
+ columnsModel.addFlexiColumnModel(authorModel);
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, LargeFilesTableColumns.license));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, LargeFilesTableColumns.language));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, LargeFilesTableColumns.source));
@@ -342,7 +343,9 @@ public class LargeFilesController extends FormBasicController implements Extende
columnsModel.addFlexiColumnModel(column);
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, LargeFilesTableColumns.lockedAt));
- columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, LargeFilesTableColumns.lockedBy, "selectLockedBy"));
+ DefaultFlexiColumnModel lockedByModel = new DefaultFlexiColumnModel(false, LargeFilesTableColumns.lockedBy, "selectLockedBy");
+ lockedByModel.setCellRenderer(UserDisplayNameCellRenderer.get());
+ columnsModel.addFlexiColumnModel(lockedByModel);
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, LargeFilesTableColumns.creator));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, LargeFilesTableColumns.publisher));
columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(false, LargeFilesTableColumns.pubDate));
diff --git a/src/main/java/org/olat/admin/sysinfo/model/LargeFilesTableModel.java b/src/main/java/org/olat/admin/sysinfo/model/LargeFilesTableModel.java
index ad95804a6db32ee2f9932cbc97e769c7df97d601..4fa781895703991066a6846b73d0304c35b650b7 100644
--- a/src/main/java/org/olat/admin/sysinfo/model/LargeFilesTableModel.java
+++ b/src/main/java/org/olat/admin/sysinfo/model/LargeFilesTableModel.java
@@ -42,7 +42,7 @@ public class LargeFilesTableModel extends DefaultFlexiTableDataModel<LargeFilesT
implements SortableFlexiTableDataModel<LargeFilesTableContentRow> {
private final Locale locale;
-
+
public LargeFilesTableModel(FlexiTableColumnModel columnModel, Locale locale) {
super(columnModel);
this.locale = locale;
@@ -72,7 +72,7 @@ implements SortableFlexiTableDataModel<LargeFilesTableContentRow> {
case contextInfo: return row.getContextInfo();
case path: return row.getPath();
case showPath: return row.getShowPath();
- case author: return row.getAuthor() != null ? row.getAuthor().getUser().getFirstName() + " " + row.getAuthor().getUser().getLastName() : null;
+ case author: return row.getAuthor();
case revision: return row.isRevision();
case fileCategory: return row.getFileCategory();
case fileType: return row.getFileType();
@@ -91,7 +91,7 @@ implements SortableFlexiTableDataModel<LargeFilesTableContentRow> {
case pubDate: return returnNullSafeDate(row.getPubDate());
case language: return row.getLanguage();
case locked: return row.isLocked();
- case lockedBy: return row.getLockedBy() != null ? row.getLockedBy().getUser().getFirstName() + " " + row.getLockedBy().getUser().getLastName() : null;
+ case lockedBy: return row.getLockedBy();
case lockedAt: return returnNullSafeDate(row.getLockedAt());
case revisionComment: return row.getRevisionComment();
case revisionNr: return row.getRevisionNr();
diff --git a/src/main/java/org/olat/core/commons/editor/htmleditor/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/core/commons/editor/htmleditor/_i18n/LocalStrings_de.properties
index f2f3f3a5dc85b8102b3dfffbe29c6f3a3ca1a28a..45ed72dceee7e321e19f031ce3339e53ab89cb9f 100644
--- a/src/main/java/org/olat/core/commons/editor/htmleditor/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/core/commons/editor/htmleditor/_i18n/LocalStrings_de.properties
@@ -7,4 +7,4 @@ saveandclosebuttontext=Speichern und schliessen
savebuttontext=Speichern
warn.foreigneditor=Achtung\! Diese Datei wurde urspr\u00FCnglich mit einem anderen HTML-Editor erstellt. Wenn sie mit dem OLAT-internen Editor bearbeitet und gespeichert wird, kann die Formatierung und der resultierende Quellcode stark ver\u00E4ndert werden\!
plaintext.error.tolarge=$org.olat.core.commons.editor.plaintexteditor\:plaintext.error.tolarge
-file.too.large.server=Die Datei konnte nicht gespeichert werden da sie zu gross ist ({0}KB). Zugelassen sind Dateien bis {1}KB.
+file.too.large.server=Die Datei konnte nicht gespeichert werden, da sie zu gross ist ({0}KB). Zugelassen sind Dateien bis {1}KB.
diff --git a/src/main/java/org/olat/core/commons/services/doceditor/onlyoffice/OnlyOfficeModule.java b/src/main/java/org/olat/core/commons/services/doceditor/onlyoffice/OnlyOfficeModule.java
index cbde2c1c42b5ee5007cac8169e99420096a35607..3bad8795a747cd12a3daa7ff747dfd557bb4e432 100644
--- a/src/main/java/org/olat/core/commons/services/doceditor/onlyoffice/OnlyOfficeModule.java
+++ b/src/main/java/org/olat/core/commons/services/doceditor/onlyoffice/OnlyOfficeModule.java
@@ -241,8 +241,9 @@ public class OnlyOfficeModule extends AbstractSpringModule implements ConfigOnOf
if (mobileModes == null) {
if (StringHelper.containsNonWhitespace(mobileModesConfig)) {
mobileModes = Arrays.stream(mobileModesConfig.split(",")).map(Mode::valueOf).collect(Collectors.toSet());
+ } else {
+ mobileModes = Collections.emptySet();
}
- mobileModes = Collections.emptySet();
}
return mobileModes;
}
diff --git a/src/main/java/org/olat/core/commons/services/webdav/manager/WebDAVManagerImpl.java b/src/main/java/org/olat/core/commons/services/webdav/manager/WebDAVManagerImpl.java
index 1e74df3c3c187e65707244a195fe8e651433b701..99b2037912278a8373a3ff778ecb26a939ff2c21 100644
--- a/src/main/java/org/olat/core/commons/services/webdav/manager/WebDAVManagerImpl.java
+++ b/src/main/java/org/olat/core/commons/services/webdav/manager/WebDAVManagerImpl.java
@@ -77,8 +77,10 @@ public class WebDAVManagerImpl implements WebDAVManager, InitializingBean {
private static boolean enabled = true;
public static final String BASIC_AUTH_REALM = "OLAT WebDAV Access";
+ private static final String DIR_CONTEXT = "_DIRCTX";
private CoordinatorManager coordinatorManager;
+ private CacheWrapper<Long,VFSResourceRoot> resourceCache;
private CacheWrapper<CacheKey,UserSession> timedSessionCache;
@Autowired
@@ -97,7 +99,10 @@ public class WebDAVManagerImpl implements WebDAVManager, InitializingBean {
@Override
public void afterPropertiesSet() throws Exception {
- timedSessionCache = coordinatorManager.getCoordinator().getCacher().getCache(WebDAVManager.class.getSimpleName(), "webdav");
+ resourceCache = coordinatorManager.getCoordinator().getCacher()
+ .getCache(WebDAVManager.class.getSimpleName(), "resources");
+ timedSessionCache = coordinatorManager.getCoordinator().getCacher()
+ .getCache(WebDAVManager.class.getSimpleName(), "webdav");
}
@Override
@@ -108,21 +113,23 @@ public class WebDAVManagerImpl implements WebDAVManager, InitializingBean {
}
usess.getSessionInfo().setLastClickTime();
- VFSResourceRoot fdc = (VFSResourceRoot)usess.getEntry("_DIRCTX");
+ VFSResourceRoot fdc = (VFSResourceRoot)usess.getEntry(DIR_CONTEXT);
if (fdc != null) {
return fdc;
}
-
- IdentityEnvironment identityEnv = usess.getIdentityEnvironment();
- VFSContainer webdavContainer = getMountableRoot(identityEnv);
-
- //create the / folder
- VirtualContainer rootContainer = new VirtualContainer("");
- rootContainer.addItem(webdavContainer);
- rootContainer.setLocalSecurityCallback(new ReadOnlyCallback());
- fdc = new VFSResourceRoot(identityEnv.getIdentity(), rootContainer);
- usess.putEntry("_DIRCTX", fdc);
+ final IdentityEnvironment identityEnv = usess.getIdentityEnvironment();
+ final Identity identity = identityEnv.getIdentity();
+
+ fdc = resourceCache.computeIfAbsent(identity.getKey(), key -> {
+ VFSContainer webdavContainer = getMountableRoot(identityEnv);
+ //create the / folder
+ VirtualContainer rootContainer = new VirtualContainer("");
+ rootContainer.addItem(webdavContainer);
+ rootContainer.setLocalSecurityCallback(new ReadOnlyCallback());
+ return new VFSResourceRoot(identity, rootContainer);
+ });
+ usess.putEntry(DIR_CONTEXT, fdc);
return fdc;
}
diff --git a/src/main/java/org/olat/course/nodes/iq/EndTimeCellRenderer.java b/src/main/java/org/olat/course/nodes/iq/EndTimeCellRenderer.java
index 2facab1d34134dd4df769b255327eea26ecf102e..4a96a4eeac5a56b5e03a2640eb1cb75b6007ebcf 100644
--- a/src/main/java/org/olat/course/nodes/iq/EndTimeCellRenderer.java
+++ b/src/main/java/org/olat/course/nodes/iq/EndTimeCellRenderer.java
@@ -58,28 +58,27 @@ public class EndTimeCellRenderer implements FlexiCellRenderer {
Integer compensationExtraTimeInSeconds = infos.getCompensationExtraTimeInSeconds();
if(infos.getStart() != null) {
- int totalTime = timeLimitInSeconds;
+ long totalTimeMs = timeLimitInSeconds * 1000l;
if(endDate != null) {
- long leadingTimeInMilliSeconds = endDate.getTime() - infos.getStart().getTime();
- int leadingTime = Math.round(leadingTimeInMilliSeconds / 1000f);
+ long leadingTimeInMs = endDate.getTime() - infos.getStart().getTime();
if(timeLimitInSeconds > 0) {
- totalTime = Math.min(totalTime, leadingTime);
+ totalTimeMs = Math.min(totalTimeMs, leadingTimeInMs);
} else {
- totalTime = leadingTime;
+ totalTimeMs = leadingTimeInMs;
}
}
if(extraTimeInSeconds != null) {
- totalTime += extraTimeInSeconds;
+ totalTimeMs += (extraTimeInSeconds * 1000l);
}
if(compensationExtraTimeInSeconds != null) {
- totalTime += compensationExtraTimeInSeconds;
+ totalTimeMs += (compensationExtraTimeInSeconds * 1000l);
}
Calendar now = Calendar.getInstance();
Calendar cal = Calendar.getInstance();
cal.setTime(infos.getStart());
- cal.add(Calendar.SECOND, totalTime);
+ cal.add(Calendar.MILLISECOND, (int)totalTimeMs);
Date dueDate = cal.getTime();
boolean sameDay = now.get(Calendar.YEAR) == cal.get(Calendar.YEAR)
diff --git a/src/main/java/org/olat/course/run/CourseRuntimeController.java b/src/main/java/org/olat/course/run/CourseRuntimeController.java
index 1dbc506ca73a419793cb8d8840e2dff59aecdaa8..d6b4ee348f3780de04cf8af9ef7562e771975d00 100644
--- a/src/main/java/org/olat/course/run/CourseRuntimeController.java
+++ b/src/main/java/org/olat/course/run/CourseRuntimeController.java
@@ -468,11 +468,13 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
toolbarPanel.setBreadcrumbEnabled(false);
}
+ RunMainController rmc = getRunMainController();
+ boolean disclaimerAccepted = rmc != null && rmc.isDisclaimerAccepted();
+
initToolsMenu(toolsDropdown);
initToolsMyCourse(course);
- initGeneralTools(course);
+ initGeneralTools(course, disclaimerAccepted);
- RunMainController rmc = getRunMainController();
if(rmc != null) {
rmc.initToolbarAndProgressbar();
}
@@ -840,7 +842,7 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
return (userCourseEnv.isParticipant() || !userCourseEnv.getParticipatingGroups().isEmpty());
}
- private void initGeneralTools(ICourse course) {
+ private void initGeneralTools(ICourse course, boolean disclaimerAccepted) {
boolean assessmentLock = isAssessmentLock();
UserCourseEnvironment userCourseEnv = getUserCourseEnvironment();
@@ -852,7 +854,7 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
toolbarPanel.addTool(detailsLink);
}
- if (!assessmentLock && !isGuestOnly
+ if (!assessmentLock && !isGuestOnly && disclaimerAccepted
&& LearningPathNodeAccessProvider.TYPE.equals(cc.getNodeAccessType().getType())) {
learningPathLink = LinkFactory.createToolLink("learningPath", translate("command.learning.path"), this, CourseTool.learningpath.getIconCss());
learningPathLink.setUrl(BusinessControlFactory.getInstance()
@@ -863,7 +865,7 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
learningPathLink.setVisible(userCourseEnv != null && userCourseEnv.isParticipant());
}
- if (!assessmentLock && !isGuestOnly
+ if (!assessmentLock && !isGuestOnly && disclaimerAccepted
&& LearningPathNodeAccessProvider.TYPE.equals(cc.getNodeAccessType().getType())) {
learningPathsLink = LinkFactory.createToolLink("learningPaths", translate("command.learning.paths"), this, CourseTool.learningpath.getIconCss());
learningPathsLink.setUrl(BusinessControlFactory.getInstance()
@@ -874,7 +876,7 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
learningPathsLink.setVisible(userCourseEnv != null && (userCourseEnv.isCoach() || userCourseEnv.isAdmin()));
}
- boolean calendarIsEnabled = !assessmentLock && !isGuestOnly && calendarModule.isEnabled()
+ boolean calendarIsEnabled = !assessmentLock && !isGuestOnly && disclaimerAccepted && calendarModule.isEnabled()
&& calendarModule.isEnableCourseToolCalendar() && reSecurity.canLaunch();
if (calendarIsEnabled && userCourseEnv != null) {
calendarLink = LinkFactory.createToolLink("calendar",translate("command.calendar"), this, "o_icon_calendar");
@@ -885,14 +887,14 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
toolbarPanel.addTool(calendarLink);
}
- if(!assessmentLock && isLecturesLinkEnabled()) {
+ if(!assessmentLock && disclaimerAccepted && isLecturesLinkEnabled()) {
lecturesLink = LinkFactory.createToolLink("command.lectures", translate("command.lectures"), this, "o_icon_lecture");
lecturesLink.setUrl(BusinessControlFactory.getInstance()
.getAuthenticatedURLFromBusinessPathStrings(businessPathEntry, "[Lectures:0]"));
toolbarPanel.addTool(lecturesLink);
}
- if(!assessmentLock && !isGuestOnly && userCourseEnv != null) {
+ if(!assessmentLock && !isGuestOnly && disclaimerAccepted && userCourseEnv != null) {
participantListLink = LinkFactory.createToolLink("participantlist",
translate(CourseTool.participantlist.getI18nKey()), this,
CourseTool.participantlist.getIconCss());
@@ -902,7 +904,7 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
toolbarPanel.addTool(participantListLink);
}
- if(!assessmentLock && userCourseEnv != null) {
+ if(!assessmentLock && disclaimerAccepted && userCourseEnv != null) {
participantInfoLink = LinkFactory.createToolLink("participantinfo",
translate(CourseTool.participantinfos.getI18nKey()), this,
CourseTool.participantinfos.getIconCss());
@@ -912,7 +914,7 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
toolbarPanel.addTool(participantInfoLink);
}
- if(!assessmentLock && !isGuestOnly && userCourseEnv != null && !userCourseEnv.isCourseReadOnly()) {
+ if(!assessmentLock && !isGuestOnly && disclaimerAccepted && userCourseEnv != null && !userCourseEnv.isCourseReadOnly()) {
emailLink = LinkFactory.createToolLink("email", translate(CourseTool.email.getI18nKey()), this, CourseTool.email.getIconCss());
emailLink.setUrl(BusinessControlFactory.getInstance()
.getAuthenticatedURLFromBusinessPathStrings(businessPathEntry, "[email:0]"));
@@ -920,7 +922,7 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
toolbarPanel.addTool(emailLink);
}
- if(!assessmentLock && userCourseEnv != null) {
+ if(!assessmentLock && disclaimerAccepted && userCourseEnv != null) {
blogLink = LinkFactory.createToolLink("blog", translate(CourseTool.blog.getI18nKey()), this, CourseTool.blog.getIconCss());
blogLink.setUrl(BusinessControlFactory.getInstance()
.getAuthenticatedURLFromBusinessPathStrings(businessPathEntry, "[blog:0]"));
@@ -928,7 +930,7 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
toolbarPanel.addTool(blogLink);
}
- if(!assessmentLock && userCourseEnv != null) {
+ if(!assessmentLock && disclaimerAccepted && userCourseEnv != null) {
wikiLink = LinkFactory.createToolLink("wiki", translate(CourseTool.wiki.getI18nKey()), this, CourseTool.wiki.getIconCss());
wikiLink.setUrl(BusinessControlFactory.getInstance()
.getAuthenticatedURLFromBusinessPathStrings(businessPathEntry, "[wiki:0]"));
@@ -936,7 +938,7 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
toolbarPanel.addTool(wikiLink);
}
- if(!assessmentLock && userCourseEnv != null) {
+ if(!assessmentLock && disclaimerAccepted && userCourseEnv != null) {
forumLink = LinkFactory.createToolLink("forum", translate(CourseTool.forum.getI18nKey()), this, CourseTool.forum.getIconCss());
forumLink.setUrl(BusinessControlFactory.getInstance()
.getAuthenticatedURLFromBusinessPathStrings(businessPathEntry, "[forum:0]"));
@@ -944,7 +946,7 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
toolbarPanel.addTool(forumLink);
}
- if(!assessmentLock && userCourseEnv != null) {
+ if(!assessmentLock && disclaimerAccepted && userCourseEnv != null) {
documentsLink = LinkFactory.createToolLink("documents", translate(CourseTool.documents.getI18nKey()), this, CourseTool.documents.getIconCss());
documentsLink.setUrl(BusinessControlFactory.getInstance()
.getAuthenticatedURLFromBusinessPathStrings(businessPathEntry, "[documents:0]"));
@@ -952,7 +954,7 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
toolbarPanel.addTool(documentsLink);
}
- if(!assessmentLock) {
+ if(!assessmentLock && disclaimerAccepted) {
glossary = new Dropdown("glossary", "command.glossary", false, getTranslator());
glossary.setIconCSS("o_icon o_FileResource-GLOSSARY_icon");
glossary.setVisible(cc.hasGlossary() && cc.isGlossaryEnabled());
@@ -967,7 +969,7 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
}
//add group chat to toolbox
- boolean chatIsEnabled = !assessmentLock && !isGuestOnly && imModule.isEnabled()
+ boolean chatIsEnabled = !assessmentLock && !isGuestOnly && disclaimerAccepted && imModule.isEnabled()
&& imModule.isCourseEnabled() && reSecurity.canLaunch();
if(chatIsEnabled && userCourseEnv != null && !userCourseEnv.isCourseReadOnly()) {
chatLink = LinkFactory.createToolLink("chat",translate("command.coursechat"), this, "o_icon_chat");
@@ -976,7 +978,7 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
}
// add course search to toolbox
- boolean isSearchEnabled = !assessmentLock && searchModule.isSearchAllowed(roles);
+ boolean isSearchEnabled = !assessmentLock && disclaimerAccepted && searchModule.isSearchAllowed(roles);
if (isSearchEnabled) {
searchLink = LinkFactory.createToolLink("coursesearch", translate("command.coursesearch"), this, "o_icon_search");
searchLink.setVisible(cc.isCourseSearchEnabled());
@@ -1152,6 +1154,8 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
} else if (event instanceof OpenCourseToolEvent) {
CourseTool tool = ((OpenCourseToolEvent)event).getTool();
doOpenTool(ureq, tool);
+ } else if (event == RunMainController.COURSE_DISCLAIMER_ACCEPTED) {
+ initToolbar();
}
} else if (lifeCycleChangeCtr == source) {
if (event == RepositoryEntryLifeCycleChangeController.deletedEvent) {
@@ -2026,7 +2030,7 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
currentToolCtr = participatListCtrl;
} else {
delayedClose = Delayed.participantList;
- };
+ }
}
private void doParticipantInfo(UserRequest ureq) {
@@ -2056,7 +2060,7 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
currentToolCtr = participatInfoCtrl;
} else {
delayedClose = Delayed.participantInfo;
- };
+ }
}
private void doEmail(UserRequest ureq) {
diff --git a/src/main/java/org/olat/course/run/RunMainController.java b/src/main/java/org/olat/course/run/RunMainController.java
index 3ea0696c395d78bc548e1eca83bde513d8b853ef..2a970478296df30e4fe637387cc9152a690b631d 100644
--- a/src/main/java/org/olat/course/run/RunMainController.java
+++ b/src/main/java/org/olat/course/run/RunMainController.java
@@ -125,6 +125,7 @@ public class RunMainController extends MainLayoutBasicController implements Gene
private static final Logger log = Tracing.createLoggerFor(RunMainController.class);
+ public static final Event COURSE_DISCLAIMER_ACCEPTED = new Event("course-disclaimer-accepted");
public static final String REBUILD = "rebuild";
public static final String ORES_TYPE_COURSE_RUN = OresHelper.calculateTypeName(RunMainController.class, CourseModule.ORES_TYPE_COURSE);
private final OLATResourceable courseRunOres; //course run ores for course run channel
@@ -154,6 +155,7 @@ public class RunMainController extends MainLayoutBasicController implements Gene
private boolean needsRebuildAfter = false;
private boolean needsRebuildAfterPublish = false;
private boolean needsRebuildAfterRunDone = false;
+ private boolean disclaimerAccepted = true;
private String courseTitle;
private Link nextLink, previousLink;
@@ -283,13 +285,15 @@ public class RunMainController extends MainLayoutBasicController implements Gene
coursemain.contextPut("courserepokey", courseRepositoryEntry.getKey());
// if a disclaimer is enabled, show it first
- if (courseModule.isDisclaimerEnabled() && course.getCourseEnvironment().getCourseConfig().isDisclaimerEnabled() &&
- !disclaimerManager.isAccessGranted(courseRepositoryEntry, getIdentity(), ureq.getUserSession().getRoles())) {
+ disclaimerAccepted = !courseModule.isDisclaimerEnabled()
+ || !course.getCourseEnvironment().getCourseConfig().isDisclaimerEnabled()
+ || disclaimerManager.isAccessGranted(courseRepositoryEntry, getIdentity(), ureq.getUserSession().getRoles());
+ if (disclaimerAccepted) {
+ coursemain.put("coursemain", columnLayoutCtr.getInitialComponent());
+ } else {
disclaimerController = new CourseDisclaimerConsentController(ureq, getWindowControl(), courseRepositoryEntry);
listenTo(disclaimerController);
coursemain.put("coursemain", disclaimerController.getInitialComponent());
- } else {
- coursemain.put("coursemain", columnLayoutCtr.getInitialComponent());
}
// on initial call we have to set the data-nodeid manually. later it
@@ -318,6 +322,10 @@ public class RunMainController extends MainLayoutBasicController implements Gene
CoordinatorManager.getInstance().getCoordinator().getEventBus().registerFor(this, identity, courseRepositoryEntry);
}
+ public boolean isDisclaimerAccepted() {
+ return disclaimerAccepted;
+ }
+
protected void setTextMarkingEnabled(boolean enabled) {
if (glossaryMarkerCtr != null) {
glossaryMarkerCtr.setTextMarkingEnabled(enabled);
@@ -431,7 +439,7 @@ public class RunMainController extends MainLayoutBasicController implements Gene
} else {
List<TreeNode> flatTree = new ArrayList<>();
TreeHelper.makeTreeFlat(luTree.getTreeModel().getRootNode(), flatTree);
- hasPrevious = getPreviousNonDelegatingNode(flatTree, luTree.getSelectedNode()) != null;;
+ hasPrevious = getPreviousNonDelegatingNode(flatTree, luTree.getSelectedNode()) != null;
int index = flatTree.indexOf(luTree.getSelectedNode());
hasNext = index >= 0 && index+1 < flatTree.size();
}
@@ -754,8 +762,10 @@ public class RunMainController extends MainLayoutBasicController implements Gene
}
} else if (source == disclaimerController) {
if (event == Event.DONE_EVENT) {
+ disclaimerAccepted = true;
coursemain.put("coursemain", columnLayoutCtr.getInitialComponent());
coursemain.setDirty(true);
+ fireEvent(ureq, COURSE_DISCLAIMER_ACCEPTED);
}
}
}
diff --git a/src/main/java/org/olat/ims/qti21/manager/AssessmentTestSessionDAO.java b/src/main/java/org/olat/ims/qti21/manager/AssessmentTestSessionDAO.java
index 6dc6cf4f41dec7d84556f2092f9bf90b850e6d70..f3aab857695d9885d84827223e41df27065c5c62 100644
--- a/src/main/java/org/olat/ims/qti21/manager/AssessmentTestSessionDAO.java
+++ b/src/main/java/org/olat/ims/qti21/manager/AssessmentTestSessionDAO.java
@@ -785,7 +785,7 @@ public class AssessmentTestSessionDAO {
decorateTestSessionPermission(sb, searchParams);
//need to be anonymized
- sb.append(" order by usr.lastName, testSession.key");
+ sb.append(" order by usr.lastName, usr.firstName, testSession.key");
TypedQuery<AssessmentTestSession> query = dbInstance.getCurrentEntityManager()
.createQuery(sb.toString(), AssessmentTestSession.class);
diff --git a/src/main/java/org/olat/ims/qti21/ui/AssessmentTestDisplayController.java b/src/main/java/org/olat/ims/qti21/ui/AssessmentTestDisplayController.java
index e0d36e83ee553e6ab547dba8e593129bec7c774a..7fd5d9e0fc52c2d9e9b692a4185c69056c44cd14 100644
--- a/src/main/java/org/olat/ims/qti21/ui/AssessmentTestDisplayController.java
+++ b/src/main/java/org/olat/ims/qti21/ui/AssessmentTestDisplayController.java
@@ -707,7 +707,7 @@ public class AssessmentTestDisplayController extends BasicController implements
private boolean timeLimitBarrier(UserRequest ureq) {
Long assessmentTestMaxTimeLimits = getAssessmentTestMaxTimeLimit();
if(assessmentTestMaxTimeLimits != null) {
- long maximumAssessmentTestDuration = assessmentTestMaxTimeLimits.longValue() * 1000;//convert in milliseconds
+ long maximumAssessmentTestDuration = assessmentTestMaxTimeLimits.longValue() * 1000l;//convert in milliseconds
TestSessionState testSessionState = testSessionController.getTestSessionState();
if(!testSessionState.isEnded() && !testSessionState.isExited()) {
long durationMillis = testSessionState.getDurationAccumulated();
@@ -768,10 +768,7 @@ public class AssessmentTestDisplayController extends BasicController implements
if(overrideOptions != null && overrideOptions.getEndTestDate() != null) {
Date endTestDate = overrideOptions.getEndTestDate();
long diff = endTestDate.getTime() - testSessionController.getCurrentRequestTimestamp().getTime();
- if(diff < 0l) {
- diff = 0l;
- }
- return diff;
+ return Long.valueOf(diff);
}
return null;// default is a year
}
@@ -1588,6 +1585,9 @@ public class AssessmentTestDisplayController extends BasicController implements
}
boolean terminated = isTerminated();
+
+ /* Enter first assessment item if possible */
+ enterFirstAssessmentItemOfAdvancedTestPart(nextTestPart, ureq);
/* Record current result state */
computeAndRecordTestAssessmentResult(currentTimestamp, testSessionState, terminated);
@@ -1604,6 +1604,22 @@ public class AssessmentTestDisplayController extends BasicController implements
}
}
+ private void enterFirstAssessmentItemOfAdvancedTestPart(TestPlanNode nextTestPart, UserRequest ureq) {
+ try {
+ if(!isTerminated() && nextTestPart != null) {
+ TestPart currentTestPart = testSessionController.getCurrentTestPart();
+ if(currentTestPart != null && currentTestPart.getNavigationMode() == NavigationMode.NONLINEAR) {
+ //go to the first assessment item
+ if(testSessionController.hasFollowingNonLinearItem()) {
+ testSessionController.selectFollowingItemNonLinear(ureq.getRequestTimestamp());
+ }
+ }
+ }
+ } catch (Exception e) {
+ logError("", e);
+ }
+ }
+
private void processReviewTestPart() {
NotificationRecorder notificationRecorder = new NotificationRecorder(NotificationLevel.INFO);
TestSessionState testSessionState = testSessionController.getTestSessionState();
diff --git a/src/main/java/org/olat/login/oauth/spi/OpenIdConnectApi.java b/src/main/java/org/olat/login/oauth/spi/OpenIdConnectApi.java
index bdb0bd5457e82d2d18c0493009ba761b71219601..77017acbaba527296e4bdbd9f0526268bfa67c8a 100644
--- a/src/main/java/org/olat/login/oauth/spi/OpenIdConnectApi.java
+++ b/src/main/java/org/olat/login/oauth/spi/OpenIdConnectApi.java
@@ -103,21 +103,21 @@ public class OpenIdConnectApi extends DefaultApi20 {
if(!oauthModule.getOpenIdConnectIFIssuer().equals(idJson.get("iss"))
|| !oauthModule.getOpenIdConnectIFIssuer().equals(accessJson.get("iss"))) {
allOk &= false;
- log.error("iss don't match issuer");
+ log.info("iss don't match issuer");
}
if(!getApiKey().equals(idJson.get("aud"))) {
allOk &= false;
- log.error("aud don't match application key");
+ log.info("aud don't match application key");
}
if(!oVerifier.getState().equals(oVerifier.getSessionState())) {
allOk &= false;
- log.error("state doesn't match session state");
+ log.info("state doesn't match session state");
}
if(!oVerifier.getSessionNonce().equals(idJson.get("nonce"))) {
allOk &= false;
- log.error("session nonce don't match verifier nonce");
+ log.info("session nonce don't match verifier nonce");
}
return allOk ? new OAuth2AccessToken(idToken, oVerifier.getState()) : null;
diff --git a/src/main/java/org/olat/login/oauth/spi/OpenIdConnectFullConfigurableApi.java b/src/main/java/org/olat/login/oauth/spi/OpenIdConnectFullConfigurableApi.java
index c20e6cb592d1432b0c315d345c6d71e3b0e86e02..37bd356eeb49e84958d94506fd2d9f37c50bba94 100644
--- a/src/main/java/org/olat/login/oauth/spi/OpenIdConnectFullConfigurableApi.java
+++ b/src/main/java/org/olat/login/oauth/spi/OpenIdConnectFullConfigurableApi.java
@@ -100,22 +100,22 @@ public class OpenIdConnectFullConfigurableApi extends DefaultApi20 {
if(!provider.getIssuer().equals(idJson.get("iss"))
|| !provider.getIssuer().equals(accessJson.get("iss"))) {
allOk &= false;
- log.error("iss don't match issuer");
+ log.info("iss don't match issuer");
}
if(!provider.getAppKey().equals(idJson.get("aud"))) {
allOk &= false;
- log.error("aud don't match application key");
+ log.info("aud don't match application key");
}
if(!oVerifier.getState().equals(oVerifier.getSessionState())) {
allOk &= false;
- log.error("state doesn't match session state");
+ log.info("state doesn't match session state");
}
if(!oVerifier.getSessionNonce().equals(idJson.get("nonce"))) {
allOk &= false;
- log.error("session nonce don't match verifier nonce");
+ log.info("session nonce don't match verifier nonce");
}
return allOk ? new OAuth2AccessToken(idToken, oVerifier.getState()) : null;
} catch (JSONException e) {
diff --git a/src/main/java/org/olat/user/ui/UserDisplayNameCellRenderer.java b/src/main/java/org/olat/user/ui/UserDisplayNameCellRenderer.java
new file mode 100644
index 0000000000000000000000000000000000000000..add40df57307a5a66bf7676364da977d0c631d1c
--- /dev/null
+++ b/src/main/java/org/olat/user/ui/UserDisplayNameCellRenderer.java
@@ -0,0 +1,65 @@
+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Initial code contributed and copyrighted by<br>
+ * frentix GmbH, http://www.frentix.com
+ * <p>
+ */
+package org.olat.user.ui;
+
+import org.olat.core.CoreSpringFactory;
+import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiCellRenderer;
+import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTableComponent;
+import org.olat.core.gui.render.Renderer;
+import org.olat.core.gui.render.StringOutput;
+import org.olat.core.gui.render.URLBuilder;
+import org.olat.core.gui.translator.Translator;
+import org.olat.core.id.Identity;
+import org.olat.core.id.User;
+import org.olat.user.UserManager;
+
+/**
+ *
+ * Initial date: 19 Feb 2021<br>
+ * @author uhensler, urs.hensler@frentix.com, http://www.frentix.com
+ *
+ */
+public class UserDisplayNameCellRenderer implements FlexiCellRenderer {
+
+ private static final UserDisplayNameCellRenderer INSTANCE = new UserDisplayNameCellRenderer();
+
+ private final UserManager userManager;
+
+ public static UserDisplayNameCellRenderer get() {
+ return INSTANCE;
+ }
+
+ private UserDisplayNameCellRenderer() {
+ this.userManager = CoreSpringFactory.getImpl(UserManager.class);
+ }
+
+ @Override
+ public void render(Renderer renderer, StringOutput target, Object cellValue, int row, FlexiTableComponent source,
+ URLBuilder ubu, Translator translator) {
+ if (cellValue instanceof Identity) {
+ String userDisplayName = userManager.getUserDisplayName(((Identity)cellValue).getKey());
+ target.append(userDisplayName);
+ } else if (cellValue instanceof User) {
+ String userDisplayName = userManager.getUserDisplayName(((User)cellValue));
+ target.append(userDisplayName);
+ }
+ }
+
+}
diff --git a/src/main/resources/infinispan-config.xml b/src/main/resources/infinispan-config.xml
index 004bc3b9d9c1531918b63b01b4b0f748c14e073a..f35866c3d20a3a8b125036da6e9b782f3f23b0cf 100644
--- a/src/main/resources/infinispan-config.xml
+++ b/src/main/resources/infinispan-config.xml
@@ -92,6 +92,14 @@
<!-- max-idle same as session time out for WebDAV session in UserSessionManager -->
</local-cache>
+ <local-cache name="WebDAVManager@resources" simple-cache="true" statistics="true" statistics-available="true">
+ <locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" />
+ <transaction mode="NONE" auto-commit="true" />
+ <memory max-count="10000" when-full="REMOVE" />
+ <expiration max-idle="900000" interval="5000" />
+ <!-- max-idle same as session time out for WebDAV session in UserSessionManager -->
+ </local-cache>
+
<local-cache name="UserManager@username" simple-cache="true" statistics="true" statistics-available="true">
<locking isolation="READ_COMMITTED" concurrency-level="1000" acquire-timeout="15000" striping="false" />
<transaction mode="NONE" auto-commit="true" />