OO-1430: reset the columns against the list of default visible columns

src/main/java/org/olat/core/gui/components/table/Table.java

@@ -109,10 +109,11 @@ public class Table extends AbstractComponent {
 
 	// order of left-to-right presentation of Columns (visible columndescriptors):
 	// list of columndescriptors
-	List<ColumnDescriptor> columnOrder; // default visibility to improve speed, not private
+	private List<ColumnDescriptor> columnOrder; // default visibility to improve speed, not private
 
 	// all column descriptors whether visible or not
-	List<ColumnDescriptor> allCDs; // default visibility to improve speed, not private
+	private List<ColumnDescriptor> allCDs; // default visibility to improve speed, not private
+	private List<ColumnDescriptor> defaultVisibleCDs;
 
 	private TableDataModel tableDataModel;
 	// DO NOT REFERENCE filteredTableDataModel directly, use always getFilteredTableDataModel() because lazy init!
@@ -156,6 +157,7 @@ public class Table extends AbstractComponent {
 		super(id, name, translator);
 		columnOrder = new ArrayList<ColumnDescriptor>(INITIAL_COLUMNSIZE);
 		allCDs = new ArrayList<ColumnDescriptor>(INITIAL_COLUMNSIZE);
+		defaultVisibleCDs = new ArrayList<ColumnDescriptor>(INITIAL_COLUMNSIZE);
 		sorter = new ArrayList<Integer>(DEFAULT_RESULTS_PER_PAGE);
 		selectedRowId = NO_ROW_SELECTED;
 		currentPageId = Integer.valueOf(1);
@@ -281,11 +283,10 @@ public class Table extends AbstractComponent {
 			} else {
 				columnOrder.add(cd);
 			}
+			defaultVisibleCDs.add(cd);
 		}
 	}
 
-	// public boolean isColumnDescriptorVisible()
-
 	/**
 	 * @param cd
 	 */
@@ -649,6 +650,17 @@ public class Table extends AbstractComponent {
 	protected ChoiceModel createChoiceModel() {
 		return new ChoiceTableDataModel(isMultiSelect(), allCDs, columnOrder, getTranslator());
 	}
+	
+	protected List<Integer> getDefaultVisibleColumns() {
+		List<Integer> indexList = new ArrayList<>();
+		for(ColumnDescriptor defaultVisibleCD:defaultVisibleCDs) {
+			int index = allCDs.indexOf(defaultVisibleCD);
+			if(index >= 0) {
+				indexList.add(index);
+			}
+		}
+		return indexList;
+	}
 
 	/**
 	 * @param selRows

src/main/java/org/olat/core/gui/components/table/TableController.java

@@ -338,7 +338,8 @@ public class TableController extends BasicController {
 				applyAndcheckChangedColumnsChoice(ureq, colsChoice.getSelectedRows());
 			} else if (event == Choice.EVNT_FORM_RESETED) {
 				//sideeffect on table and prefs
-				applyAndcheckChangedColumnsChoice(ureq, colsChoice.getAllRows());
+				List<Integer> visibleCols = table.getDefaultVisibleColumns();
+				applyAndcheckChangedColumnsChoice(ureq, visibleCols);
 			} else { // cancelled
 				cmc.deactivate();
 			}
@@ -515,6 +516,7 @@ public class TableController extends BasicController {
 		if (tableModel != null) {
 			contentVc.contextPut("tableEmpty", tableModel.getRowCount() == 0 ? Boolean.TRUE : Boolean.FALSE);
 			contentVc.contextPut("numberOfElements", String.valueOf(table.getUnfilteredRowCount()));
+			contentVc.contextPut("rowCounts", String.valueOf(table.getRowCount()));
 			if (table.isTableFiltered()) {
 				contentVc.contextPut("numberFilteredElements", String.valueOf(table.getRowCount()));
 				contentVc.contextPut(VC_VAR_IS_FILTERED, Boolean.TRUE); 

src/main/java/org/olat/core/gui/components/table/_content/tablelayout.html

@@ -11,8 +11,8 @@
 		</div>
 		<div class="col-sm-3 col-xs-4 o_table_row_count">
 		#if ($tableConfig.isDisplayRowCount())
-			$numberOfElements
-			#if ($numberOfElements == "1")
+			$rowCounts
+			#if ($rowCounts == "1")
 				$r.translate("table.entry")
 			#else
 				$r.translate("table.entries")