From eaba6e01983ba78fd8ba12a4b73196d3c17ed745 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 2 Feb 2016 10:34:20 +0100
Subject: [PATCH] OO-1866: make unique ids for the toggle panel
---
.../structel/edit/EPCollectRestrictionResultController.java | 3 +++
.../ui/structel/edit/_content/restrictions_msg.html | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/portfolio/ui/structel/edit/EPCollectRestrictionResultController.java b/src/main/java/org/olat/portfolio/ui/structel/edit/EPCollectRestrictionResultController.java
index 92798969126..9c0321fb59b 100644
--- a/src/main/java/org/olat/portfolio/ui/structel/edit/EPCollectRestrictionResultController.java
+++ b/src/main/java/org/olat/portfolio/ui/structel/edit/EPCollectRestrictionResultController.java
@@ -22,6 +22,7 @@ package org.olat.portfolio.ui.structel.edit;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
+import java.util.concurrent.atomic.AtomicLong;
import org.olat.core.CoreSpringFactory;
import org.olat.core.gui.UserRequest;
@@ -49,11 +50,13 @@ import org.olat.portfolio.ui.filter.PortfolioFilterController;
public class EPCollectRestrictionResultController extends BasicController {
private final VelocityContainer mainVc;
+ private static final AtomicLong restrictionsCounter = new AtomicLong(1l);
public EPCollectRestrictionResultController(UserRequest ureq, WindowControl wControl) {
super(ureq, wControl);
mainVc = createVelocityContainer("restrictions_msg");
+ mainVc.contextPut("restrictionId", Long.toString(restrictionsCounter.getAndIncrement()));
putInitialPanel(mainVc);
}
diff --git a/src/main/java/org/olat/portfolio/ui/structel/edit/_content/restrictions_msg.html b/src/main/java/org/olat/portfolio/ui/structel/edit/_content/restrictions_msg.html
index 27870125841..af2db8790a2 100644
--- a/src/main/java/org/olat/portfolio/ui/structel/edit/_content/restrictions_msg.html
+++ b/src/main/java/org/olat/portfolio/ui/structel/edit/_content/restrictions_msg.html
@@ -1,12 +1,12 @@
#if($messages)
-<div class="panel-group" id="o_ep_restrictions">
+<div class="panel-group" id="o_ep_restrictions_$restrictionId">
<div class="panel #if($restrictionsPassed) panel-success #else panel-warning #end">
<div class="panel-heading">
<h4 class="panel-title">
- <a data-toggle="collapse" data-parent="#o_ep_restrictions" href="#collapseMessages">$r.translate("collect.restriction")</a>
+ <a data-toggle="collapse" data-parent="#o_ep_restrictions_$restrictionId" href="#collapseMessages_$restrictionId">$r.translate("collect.restriction")</a>
</h4>
</div>
- <div id="collapseMessages" class="panel-collapse collapse">
+ <div id="collapseMessages_$restrictionId" class="panel-collapse collapse">
<div class="panel-body">
#foreach($message in $messages)
<p>$message</p>
--
GitLab