From ec5d1eb102e9620d4c08693fd82170977f7a38f3 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Thu, 30 Jan 2020 15:36:49 +0100
Subject: [PATCH] Bugfix: List of forecasts from previous seasons now work
again
---
forecasts/models.py | 6 +++---
forecasts/views.py | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/forecasts/models.py b/forecasts/models.py
index d9cd618c..eeaba0b6 100755
--- a/forecasts/models.py
+++ b/forecasts/models.py
@@ -231,15 +231,15 @@ class ForecastConfiguration:
crop_organism_id_paramstring += "&cropOrganismId=%s" % crop_organism_id
request_result = None
- if settings.INCLUDE_ORGANIZATION_IDS == None:
- print "%s://%s/rest/organizationforecastconfigurations/%s?from=%s-01-01&to=%s-12-31%s" % (
+ if settings.INCLUDE_ORGANIZATION_IDS == None or len(settings.INCLUDE_ORGANIZATION_IDS) == 1:
+ """print "%s://%s/rest/organizationforecastconfigurations/%s?from=%s-01-01&to=%s-12-31%s" % (
settings.VIPSLOGIC_PROTOCOL,
settings.VIPSLOGIC_SERVER_NAME,
settings.VIPS_ORGANIZATION_ID,
season,
season,
crop_organism_id_paramstring
- )
+ )"""
request_result = requests.get("%s://%s/rest/organizationforecastconfigurations/%s?from=%s-01-01&to=%s-12-31%s" % (
settings.VIPSLOGIC_PROTOCOL,
diff --git a/forecasts/views.py b/forecasts/views.py
index 400eff6c..d1edf508 100755
--- a/forecasts/views.py
+++ b/forecasts/views.py
@@ -32,6 +32,7 @@ def index(request):
season_range = range(2016, datetime.now().year + 1)
season = int(request.GET.get("season", (datetime.now() + relativedelta(months = settings.SYSTEM_TIME_OFFSET_MONTHS)).year))
forecast_configurations = ForecastConfiguration.get_forecast_configurations_from_vipslogic(None, season).text
+ #print forecast_configurations
private_forecast_configurations = None
if request.session.get("user_uuid",None) != None:
private_forecast_configurations = ForecastConfiguration.get_private_forecast_configurations(request.session["user_uuid"])
--
GitLab