From a899a5f58b852b0fe654f0c088427319a9c98331 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 27 Jul 2017 13:49:06 +0200
Subject: [PATCH] Putting private forecasts on top of the list
---
.../vips/logic/i18n/vipslogictexts.properties | 1 +
.../logic/i18n/vipslogictexts_bs.properties | 1 +
.../logic/i18n/vipslogictexts_hr.properties | 1 +
.../logic/i18n/vipslogictexts_nb.properties | 1 +
.../logic/i18n/vipslogictexts_sr.properties | 1 +
.../logic/i18n/vipslogictexts_zh_CN.properties | 1 +
.../templates/forecastConfigurationList.ftl | 17 +++++++++--------
7 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
index 6fc2ad1a..1c7c7069 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts.properties
@@ -443,3 +443,4 @@ unknownOrganismId=Unknown Organism Id
vipsLogicRole_7=Organism editor
nameAlreadyExists=The name already exists
loginCredentials=Login credentials
+publicForecasts=Public forecasts
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties
index a44d6707..923f55ff 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_bs.properties
@@ -443,3 +443,4 @@ unknownOrganismId=Unknown Organism Id
vipsLogicRole_7=Organism editor
nameAlreadyExists=The name already exists
loginCredentials=Login credentials
+publicForecasts=Public forecasts
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties
index dfe7b9aa..964b0c08 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_hr.properties
@@ -442,3 +442,4 @@ unknownOrganismId=Unknown Organism Id
vipsLogicRole_7=Organism editor
nameAlreadyExists=The name already exists
loginCredentials=Login credentials
+publicForecasts=Public forecasts
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
index 764ca1eb..2d8ed37a 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_nb.properties
@@ -443,3 +443,4 @@ unknownOrganismId=Ukjent organismeId
vipsLogicRole_7=Organismeredakt\u00f8r
nameAlreadyExists=Navnet er allerede i bruk
loginCredentials=Innloggingsinformasjon
+publicForecasts=Offentlige varsler
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties
index 0c76874c..b02140d4 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_sr.properties
@@ -443,3 +443,4 @@ unknownOrganismId=Unknown Organism Id
vipsLogicRole_7=Organism editor
nameAlreadyExists=The name already exists
loginCredentials=Login credentials
+publicForecasts=Public forecasts
diff --git a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
index ebbafe64..e2d6d759 100755
--- a/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
+++ b/src/main/resources/no/nibio/vips/logic/i18n/vipslogictexts_zh_CN.properties
@@ -440,3 +440,4 @@ unknownOrganismId=Unknown Organism Id
vipsLogicRole_7=Organism editor
nameAlreadyExists=The name already exists
loginCredentials=Login credentials
+publicForecasts=Public forecasts
diff --git a/src/main/webapp/templates/forecastConfigurationList.ftl b/src/main/webapp/templates/forecastConfigurationList.ftl
index df4e1ba3..f7a4459f 100755
--- a/src/main/webapp/templates/forecastConfigurationList.ftl
+++ b/src/main/webapp/templates/forecastConfigurationList.ftl
@@ -25,7 +25,8 @@
<div class="alert alert-success">${i18nBundle(messageKey)}</div>
</#if>
<button type="button" class="btn btn-default" onclick="window.location.href='/forecastConfiguration?action=viewForecastConfiguration&forecastConfigurationId=-1'">${i18nBundle.addNew}</button>
- <#if user.isSuperUser() || user.isOrganizationAdmin()>
+
+ <#if user.isSuperUser() || user.isOrganizationAdmin()>
<div class="panel panel-default">
<div class="panel-body">
<form class="form-inline" role="form" action="/forecastConfiguration" method="GET">
@@ -67,9 +68,8 @@
</form>
</div>
</div>
-
-
<button type="button" class="btn btn-default" onclick="window.location.href='/forecastConfiguration?action=viewForecastConfiguration&forecastConfigurationId=-1&multipleNew=true'">${i18nBundle.addMultipleNew}</button>
+ <h2>${i18nBundle.privateForecasts}</h2>
<div class="table-responsive">
<table class="table table-striped">
<thead>
@@ -80,7 +80,7 @@
<th>${i18nBundle.dateEnd}</th>
</thead>
<tbody>
- <#list forecastConfigurations as forecastConfiguration>
+ <#list privateForecastConfigurations as forecastConfiguration>
<tr style="cursor: pointer;" onclick="window.location.href='/forecastConfiguration?action=viewForecastConfiguration&forecastConfigurationId=${forecastConfiguration.forecastConfigurationId}';">
<td>
<#if i18nBundle.containsKey(forecastConfiguration.modelId)>
@@ -97,9 +97,8 @@
</#list>
</tbody>
</table>
- </div>
- </#if>
- <h2>${i18nBundle.privateForecasts}</h2>
+ </div>
+ <h2>${i18nBundle.publicForecasts}</h2>
<div class="table-responsive">
<table class="table table-striped">
<thead>
@@ -110,7 +109,7 @@
<th>${i18nBundle.dateEnd}</th>
</thead>
<tbody>
- <#list privateForecastConfigurations as forecastConfiguration>
+ <#list forecastConfigurations as forecastConfiguration>
<tr style="cursor: pointer;" onclick="window.location.href='/forecastConfiguration?action=viewForecastConfiguration&forecastConfigurationId=${forecastConfiguration.forecastConfigurationId}';">
<td>
<#if i18nBundle.containsKey(forecastConfiguration.modelId)>
@@ -128,6 +127,8 @@
</tbody>
</table>
</div>
+ </#if>
+
<#if user.isSuperUser() >
<h2>${i18nBundle.privateForecastsForOtherUser}</h2>
<div class="form-group">
--
GitLab