From 7053c42066fb1e6496ab29f9a93fd0d93190a3b5 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Tue, 17 Mar 2020 15:24:59 +0100
Subject: [PATCH] Bugfix: Showing private forecasts correctly
---
src/main/webapp/templates/forecastConfigurationList.ftl | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/templates/forecastConfigurationList.ftl b/src/main/webapp/templates/forecastConfigurationList.ftl
index 2c3b2299..46a9a094 100755
--- a/src/main/webapp/templates/forecastConfigurationList.ftl
+++ b/src/main/webapp/templates/forecastConfigurationList.ftl
@@ -69,6 +69,7 @@
</div>
</div>
<button type="button" class="btn btn-default" onclick="window.location.href='/forecastConfiguration?action=viewForecastConfiguration&forecastConfigurationId=-1&multipleNew=true'">${i18nBundle.addMultipleNew}</button>
+ </#if>
<h2>${i18nBundle.privateForecasts}</h2>
<div class="table-responsive">
<table class="table table-striped">
@@ -98,6 +99,7 @@
</tbody>
</table>
</div>
+ <#if user.isSuperUser() || user.isOrganizationAdmin()>
<h2>${i18nBundle.publicForecasts}</h2>
<div class="table-responsive">
<table class="table table-striped">
@@ -127,7 +129,7 @@
</tbody>
</table>
</div>
- </#if>
+ </#if>
<#if user.isSuperUser() >
<h2>${i18nBundle.privateForecastsForOtherUser}</h2>
@@ -155,7 +157,7 @@
<th>${i18nBundle.dateEnd}</th>
</thead>
<tbody>
- <#list privateForecastConfigurations as forecastConfiguration>
+ <#list privateForecastConfigurationsForOtherUser as forecastConfiguration>
<tr style="cursor: pointer;" onclick="window.location.href='/forecastConfiguration?action=viewForecastConfiguration&forecastConfigurationId=${forecastConfiguration.forecastConfigurationId}';">
<td>
<#if i18nBundle.containsKey(forecastConfiguration.modelId)>
--
GitLab