Skip to content
Snippets Groups Projects
Commit 7053c420 authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Bugfix: Showing private forecasts correctly

parent a032cf5f
No related branches found
No related tags found
2 merge requests!22Develop,!20Privat varsel
...@@ -69,6 +69,7 @@ ...@@ -69,6 +69,7 @@
</div> </div>
</div> </div>
<button type="button" class="btn btn-default" onclick="window.location.href='/forecastConfiguration?action=viewForecastConfiguration&forecastConfigurationId=-1&multipleNew=true'">${i18nBundle.addMultipleNew}</button> <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> <h2>${i18nBundle.privateForecasts}</h2>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped"> <table class="table table-striped">
...@@ -98,6 +99,7 @@ ...@@ -98,6 +99,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
<#if user.isSuperUser() || user.isOrganizationAdmin()>
<h2>${i18nBundle.publicForecasts}</h2> <h2>${i18nBundle.publicForecasts}</h2>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped"> <table class="table table-striped">
...@@ -127,7 +129,7 @@ ...@@ -127,7 +129,7 @@
</tbody> </tbody>
</table> </table>
</div> </div>
</#if> </#if>
<#if user.isSuperUser() > <#if user.isSuperUser() >
<h2>${i18nBundle.privateForecastsForOtherUser}</h2> <h2>${i18nBundle.privateForecastsForOtherUser}</h2>
...@@ -155,7 +157,7 @@ ...@@ -155,7 +157,7 @@
<th>${i18nBundle.dateEnd}</th> <th>${i18nBundle.dateEnd}</th>
</thead> </thead>
<tbody> <tbody>
<#list privateForecastConfigurations as forecastConfiguration> <#list privateForecastConfigurationsForOtherUser as forecastConfiguration>
<tr style="cursor: pointer;" onclick="window.location.href='/forecastConfiguration?action=viewForecastConfiguration&forecastConfigurationId=${forecastConfiguration.forecastConfigurationId}';"> <tr style="cursor: pointer;" onclick="window.location.href='/forecastConfiguration?action=viewForecastConfiguration&forecastConfigurationId=${forecastConfiguration.forecastConfigurationId}';">
<td> <td>
<#if i18nBundle.containsKey(forecastConfiguration.modelId)> <#if i18nBundle.containsKey(forecastConfiguration.modelId)>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment