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 927989691261c0a53f39a0aac44a8adaa9593321..9c0321fb59baf27ef2a14af1ff196dec653a4686 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 27870125841d08dfb7ebd5533c6b86909931ad96..af2db8790a2b5bc6aa4f7e2ff89125358f42e44f 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>