Skip to content
Snippets Groups Projects
Commit 7072dcfc authored by srosse's avatar srosse
Browse files

Merge OpenOLAT 10.4 to OpenOLAT default branch with 6b29e1e4d55b090a2f097bada204fc219f10beb1

parents ff8d8be0 9c5943fc
No related branches found
No related tags found
No related merge requests found
...@@ -131,3 +131,4 @@ cf5d0249c269c1f9b148726907f6bd13f862c153 OpenOLAT 10.4.3 ...@@ -131,3 +131,4 @@ cf5d0249c269c1f9b148726907f6bd13f862c153 OpenOLAT 10.4.3
cf5d0249c269c1f9b148726907f6bd13f862c153 OpenOLAT 10.4.3 cf5d0249c269c1f9b148726907f6bd13f862c153 OpenOLAT 10.4.3
1bab889e2565cf0443743da51ad98226e8a6ff8e OpenOLAT 10.4.3 1bab889e2565cf0443743da51ad98226e8a6ff8e OpenOLAT 10.4.3
bc8ce641a5620f5717e9a73e31028d41ab7cdc5d OpenOLAT 10.4.4 bc8ce641a5620f5717e9a73e31028d41ab7cdc5d OpenOLAT 10.4.4
d355c6357d0e5aeb25fc978b747824447a214b88 OpenOLAT 10.4.5
...@@ -159,17 +159,25 @@ public class DialogElementsTableModel extends BaseTableDataModelWithoutFilter<Di ...@@ -159,17 +159,25 @@ public class DialogElementsTableModel extends BaseTableDataModelWithoutFilter<Di
@Override @Override
public void renderValue(StringOutput sb, int row, Renderer renderer) { public void renderValue(StringOutput sb, int row, Renderer renderer) {
URLBuilder ubu = renderer.getUrlBuilder(); if(renderer == null) {//download
ubu = ubu.createCopyFor(getTable()); int sortedRow = table.getSortedRow(row);
Object entry = table.getTableDataModel().getValueAt(sortedRow, getDataColumn());
int sortedRow = table.getSortedRow(row); if(entry != null) {
Object entry = getTable().getTableDataModel().getValueAt(sortedRow, getDataColumn()); sb.append(entry.toString());
}
StringOutput link = new StringOutput(); } else {
ubu.buildURI(link, new String[] { Table.COMMANDLINK_ROWACTION_CLICKED, Table.COMMANDLINK_ROWACTION_ID }, new String[] { String.valueOf(row), DialogElementsController.ACTION_SHOW_FILE }); // url URLBuilder ubu = renderer.getUrlBuilder();
sb.append("<a href=\"javascript:o_openPopUp('").append(link).append(entry.toString()).append("','fileview','600','700','no')\">") ubu = ubu.createCopyFor(getTable());
.append(entry.toString())
.append("</a>"); 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>");
}
} }
} }
} }
...@@ -384,6 +384,14 @@ public class RepositoryEditDescriptionController extends FormBasicController { ...@@ -384,6 +384,14 @@ public class RepositoryEditDescriptionController extends FormBasicController {
allOk &= validateTextElement(externalRef, 58); allOk &= validateTextElement(externalRef, 58);
allOk &= validateTextElement(expenditureOfWork, 225); allOk &= validateTextElement(expenditureOfWork, 225);
allOk &= validateTextElement(authors, 2000); 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 // Ok, passed all checks
return allOk & super.validateFormLogic(ureq); return allOk & super.validateFormLogic(ureq);
......
...@@ -141,6 +141,7 @@ public class ForumPage { ...@@ -141,6 +141,7 @@ public class ForumPage {
public ForumPage openThreadInPeekview(String title) { public ForumPage openThreadInPeekview(String title) {
By threadBy = By.xpath("//div[contains(@class,'o_forum_peekview_message')]//a[span[text()='" + 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(); browser.findElement(threadBy).click();
OOGraphene.waitBusy(browser); OOGraphene.waitBusy(browser);
return this; return this;
......
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