diff --git a/forecasts/models.py b/forecasts/models.py index d9cd618c4b31289e77ac9bdec42ad6b8c3ce38c8..eeaba0b6f2834e8b55238a3ab7e2d7520f32b1c7 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 400eff6c7e8b0d68fa164bedf149c14a3e62fbee..d1edf5083527ffa38aae36a770e788667adaf9cc 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"])