Merge branch 'OpenOLAT_12.5' of...

Merge branch 'OpenOLAT_12.5' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git into OpenOLAT_12.5

src/main/java/org/olat/course/nodes/cl/ui/CheckListAssessmentController.java

@@ -274,7 +274,7 @@ public class CheckListAssessmentController extends FormBasicController implement
 		table.setCustomizeColumns(true);
 		FlexiTableSortOptions sortOptions = new FlexiTableSortOptions();
 		table.setSortSettings(sortOptions);
-		table.setAndLoadPersistedPreferences(ureq, "checklist-assessment");
+		table.setAndLoadPersistedPreferences(ureq, "checklist-assessment-" + courseNode.getIdent());
 		
 		pdfExportButton = uifactory.addFormLink("pdf.export", formLayout, Link.BUTTON);
 		pdfExportButton.setEnabled(numOfCheckbox > 0);

src/main/java/org/olat/course/nodes/cl/ui/CheckListAssessmentDataModel.java

@@ -311,6 +311,8 @@ public class CheckListAssessmentDataModel extends DefaultFlexiTableDataModel<Che
 							Float[] scores = assessmentRow.getScores();
 							if(checked && scores != null && scores.length > 0 && propIndex < scores.length) {
 								dataRow.addCell(pos++, scores[propIndex], null);
+							} else {
+								dataRow.addCell(pos++, null);
 							}
 						}
 					} else {

src/main/java/org/olat/modules/fo/manager/ForumManager.java

@@ -692,12 +692,12 @@ public class ForumManager {
 	public List<Message> getNewMessageInfo(Long forumKey, Date latestRead) {
 		StringBuilder query = new StringBuilder();
 		query.append("select msg from fomessage as msg ")
-		     .append(" inner join fetch msg.creator as creator")
+		     .append(" left join fetch msg.creator as creator")
 		     .append(" where msg.forum.key=:forumKey and msg.lastModified>:latestRead order by msg.lastModified desc");
 
 		return dbInstance.getCurrentEntityManager()
 				.createQuery(query.toString(), Message.class)
-				.setParameter("forumKey", forumKey.longValue())
+				.setParameter("forumKey", forumKey)
 				.setParameter("latestRead", latestRead, TemporalType.TIMESTAMP)
 				.getResultList();
 	}

src/main/java/org/olat/modules/fo/ui/ForumUserListController.java

@@ -127,6 +127,7 @@ public class ForumUserListController extends FormBasicController {
 		dataModel = new ForumUserDataModel(columnsModel, getTranslator());
 		tableEl = uifactory.addTableElement(getWindowControl(), "users", dataModel, 25, false, getTranslator(), formLayout);
 		tableEl.setPageSize(25);
+		tableEl.setAndLoadPersistedPreferences(ureq, "forum-users");
 	}
 	
 	private void loadModel() {

src/main/java/org/olat/modules/fo/ui/ThreadListController.java

@@ -22,7 +22,6 @@ package org.olat.modules.fo.ui;
 import java.util.Iterator;
 import java.util.List;
 
-import org.olat.basesecurity.BaseSecurityModule;
 import org.olat.core.CoreSpringFactory;
 import org.olat.core.commons.persistence.DBFactory;
 import org.olat.core.commons.persistence.SortKey;
@@ -92,8 +91,6 @@ public class ThreadListController extends FormBasicController {
 	private SearchModule searchModule;
 	@Autowired
 	private ForumManager forumManager;
-	@Autowired
-	private BaseSecurityModule securityModule;
 	
 	public ThreadListController(UserRequest ureq, WindowControl wControl, Forum forum, ForumCallback foCallback) {
 		super(ureq, wControl, "threads");
@@ -118,7 +115,7 @@ public class ThreadListController extends FormBasicController {
 			archiveForumButton.setIconLeftCSS("o_icon o_icon-fw o_icon_archive_tool");
 			archiveForumButton.setElementCssClass("o_sel_forum_archive");
 		}
-		if(securityModule.isUserAllowedAutoComplete(ureq.getUserSession().getRoles()) && foCallback.mayFilterForUser() ) {
+		if(foCallback.mayFilterForUser() ) {
 			userListButton = uifactory.addFormLink("filter", formLayout, Link.BUTTON_SMALL);
 			userListButton.setIconLeftCSS("o_icon o_icon-fw o_icon_user");
 			userListButton.setElementCssClass("o_sel_forum_filter");

src/main/java/org/olat/modules/lecture/ui/ReasonAdminController.java

@@ -101,11 +101,13 @@ public class ReasonAdminController extends FormBasicController {
 		columnsModel.addFlexiColumnModel(editColumn);
 		DefaultFlexiColumnModel toolsColumn = new DefaultFlexiColumnModel(ReasonCols.tools);
 		toolsColumn.setExportable(false);
+		toolsColumn.setAlwaysVisible(true);
 		columnsModel.addFlexiColumnModel(toolsColumn);
 		
 		dataModel = new ReasonAdminDataModel(columnsModel, getLocale());
-		tableEl = uifactory.addTableElement(getWindowControl(), "table", dataModel, getTranslator(), formLayout);
+		tableEl = uifactory.addTableElement(getWindowControl(), "table", dataModel, 20, false, getTranslator(), formLayout);
 		tableEl.setExportEnabled(true);
+		tableEl.setAndLoadPersistedPreferences(ureq, "absences-reasons");
 	}
 	
 	private void loadModel() {