From a8057428e804f895116e1345830554efc8caa8e6 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 30 Aug 2016 21:10:00 +0200
Subject: [PATCH] OO-2057: fix rs
---
.../modules/portfolio/ui/AbstractPageListController.java | 3 ++-
.../olat/modules/portfolio/ui/MediaCenterController.java | 6 +++++-
.../modules/portfolio/ui/model/PortfolioElementRow.java | 7 +++++--
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/modules/portfolio/ui/AbstractPageListController.java b/src/main/java/org/olat/modules/portfolio/ui/AbstractPageListController.java
index c077daae595..fd4f46b9c75 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/AbstractPageListController.java
+++ b/src/main/java/org/olat/modules/portfolio/ui/AbstractPageListController.java
@@ -462,12 +462,13 @@ implements Activateable2, TooledController, FlexiTableComponentDelegate {
} else if(event instanceof SelectionEvent) {
SelectionEvent se = (SelectionEvent)event;
String cmd = se.getCommand();
- PortfolioElementRow row = model.getObject(se.getIndex());
if("up".equals(cmd)) {
+ PortfolioElementRow row = model.getObject(se.getIndex());
if(row.isPendingAssignment()) {
doMoveUpAssignment(row);
}
} else if("down".equals(cmd)) {
+ PortfolioElementRow row = model.getObject(se.getIndex());
if(row.isPendingAssignment()) {
doMoveDownAssignment(row);
}
diff --git a/src/main/java/org/olat/modules/portfolio/ui/MediaCenterController.java b/src/main/java/org/olat/modules/portfolio/ui/MediaCenterController.java
index 5fb5877c62f..51fc7526ad5 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/MediaCenterController.java
+++ b/src/main/java/org/olat/modules/portfolio/ui/MediaCenterController.java
@@ -449,7 +449,11 @@ public class MediaCenterController extends FormBasicController
List<MediaRow> rows = model.getObjects();
for(MediaRow row:rows) {
if(row != null && row.getKey().equals(rowKey)) {
- doOpenMedia(ureq, rowKey);
+ if(select) {
+ doSelect(ureq, rowKey);
+ } else {
+ doOpenMedia(ureq, rowKey);
+ }
}
}
} catch (NumberFormatException e) {
diff --git a/src/main/java/org/olat/modules/portfolio/ui/model/PortfolioElementRow.java b/src/main/java/org/olat/modules/portfolio/ui/model/PortfolioElementRow.java
index c31ddd65fa3..79b58fd10fa 100644
--- a/src/main/java/org/olat/modules/portfolio/ui/model/PortfolioElementRow.java
+++ b/src/main/java/org/olat/modules/portfolio/ui/model/PortfolioElementRow.java
@@ -23,6 +23,7 @@ import java.util.Collection;
import java.util.Date;
import org.olat.core.gui.components.form.flexible.elements.FormLink;
+import org.olat.core.util.StringHelper;
import org.olat.course.assessment.AssessmentHelper;
import org.olat.modules.portfolio.AssessmentSection;
import org.olat.modules.portfolio.Assignment;
@@ -292,9 +293,11 @@ public class PortfolioElementRow {
this.commentFormLink = commentFormLink;
}
-
public String[] getMetaBinderAndSectionTitles() {
- return new String[]{ metaBinderTitle, metaSectionTitle };
+ if(StringHelper.containsNonWhitespace(metaBinderTitle) && StringHelper.containsNonWhitespace(metaSectionTitle)) {
+ return new String[]{ metaBinderTitle, metaSectionTitle };
+ }
+ return null;
}
public void setMetaSectionTitle(String metaSectionTitle) {
--
GitLab