diff --git a/.hgtags b/.hgtags index e1cb21e8dfbd5285c2b8ffa7cc0d1d28b704b623..fae1f13c7326658757df5d62231549523fa9f7c1 100644 --- a/.hgtags +++ b/.hgtags @@ -131,3 +131,4 @@ cf5d0249c269c1f9b148726907f6bd13f862c153 OpenOLAT 10.4.3 cf5d0249c269c1f9b148726907f6bd13f862c153 OpenOLAT 10.4.3 1bab889e2565cf0443743da51ad98226e8a6ff8e OpenOLAT 10.4.3 bc8ce641a5620f5717e9a73e31028d41ab7cdc5d OpenOLAT 10.4.4 +d355c6357d0e5aeb25fc978b747824447a214b88 OpenOLAT 10.4.5 diff --git a/src/main/java/org/olat/modules/dialog/DialogElementsTableModel.java b/src/main/java/org/olat/modules/dialog/DialogElementsTableModel.java index b56940b20338b0b363792c4a6baf40e0dde24189..4b84677381acb2c8d81b1eef120668ee181a95cb 100644 --- a/src/main/java/org/olat/modules/dialog/DialogElementsTableModel.java +++ b/src/main/java/org/olat/modules/dialog/DialogElementsTableModel.java @@ -159,17 +159,25 @@ public class DialogElementsTableModel extends BaseTableDataModelWithoutFilter<Di @Override public void renderValue(StringOutput sb, int row, Renderer renderer) { - URLBuilder ubu = renderer.getUrlBuilder(); - ubu = ubu.createCopyFor(getTable()); - - int sortedRow = table.getSortedRow(row); - Object entry = getTable().getTableDataModel().getValueAt(sortedRow, getDataColumn()); - - StringOutput link = new StringOutput(); - ubu.buildURI(link, new String[] { Table.COMMANDLINK_ROWACTION_CLICKED, Table.COMMANDLINK_ROWACTION_ID }, new String[] { String.valueOf(row), DialogElementsController.ACTION_SHOW_FILE }); // url - sb.append("<a href=\"javascript:o_openPopUp('").append(link).append(entry.toString()).append("','fileview','600','700','no')\">") - .append(entry.toString()) - .append("</a>"); + if(renderer == null) {//download + int sortedRow = table.getSortedRow(row); + Object entry = table.getTableDataModel().getValueAt(sortedRow, getDataColumn()); + if(entry != null) { + sb.append(entry.toString()); + } + } else { + URLBuilder ubu = renderer.getUrlBuilder(); + ubu = ubu.createCopyFor(getTable()); + + int sortedRow = table.getSortedRow(row); + Object entry = table.getTableDataModel().getValueAt(sortedRow, getDataColumn()); + + StringOutput link = new StringOutput(); + ubu.buildURI(link, new String[] { Table.COMMANDLINK_ROWACTION_CLICKED, Table.COMMANDLINK_ROWACTION_ID }, new String[] { String.valueOf(row), DialogElementsController.ACTION_SHOW_FILE }); // url + sb.append("<a href=\"javascript:o_openPopUp('").append(link).append(entry.toString()).append("','fileview','600','700','no')\">") + .append(entry.toString()) + .append("</a>"); + } } } } diff --git a/src/main/java/org/olat/repository/ui/author/RepositoryEditDescriptionController.java b/src/main/java/org/olat/repository/ui/author/RepositoryEditDescriptionController.java index 2c9860ecdbdaa910b003697be654892255089888..1b3c1856c712bebfd2aa891beb7180965f4c21fa 100644 --- a/src/main/java/org/olat/repository/ui/author/RepositoryEditDescriptionController.java +++ b/src/main/java/org/olat/repository/ui/author/RepositoryEditDescriptionController.java @@ -384,6 +384,14 @@ public class RepositoryEditDescriptionController extends FormBasicController { allOk &= validateTextElement(externalRef, 58); allOk &= validateTextElement(expenditureOfWork, 225); allOk &= validateTextElement(authors, 2000); + + publicDatesEl.clearError(); + if(publicDatesEl.isEnabled() && publicDatesEl.isVisible()) { + if(!publicDatesEl.isOneSelected()) { + publicDatesEl.setErrorKey("form.legende.mandatory", null); + allOk &= false; + } + } // Ok, passed all checks return allOk & super.validateFormLogic(ureq); diff --git a/src/test/java/org/olat/selenium/page/forum/ForumPage.java b/src/test/java/org/olat/selenium/page/forum/ForumPage.java index eb5df89d7875a30d3e152d92c2ab1f54e9a9956e..96654244e9accac812e4878e4ed312908cfad295 100644 --- a/src/test/java/org/olat/selenium/page/forum/ForumPage.java +++ b/src/test/java/org/olat/selenium/page/forum/ForumPage.java @@ -141,6 +141,7 @@ public class ForumPage { public ForumPage openThreadInPeekview(String title) { By threadBy = By.xpath("//div[contains(@class,'o_forum_peekview_message')]//a[span[text()='" + title + "']]"); + OOGraphene.waitElement(threadBy, 5, browser); browser.findElement(threadBy).click(); OOGraphene.waitBusy(browser); return this;