From f61fa21d34da81f61921b827a7137bfa5639be8c Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Mon, 23 Nov 2020 14:49:22 +0100
Subject: [PATCH] Now compatible with Django 3.0
---
VIPSWeb/settings.py | 2 +-
VIPSWeb/templates/base.html | 2 +-
VIPSWeb/templates/base_with_date_picker.html | 2 +-
VIPSWeb/templates/index.html | 2 +-
VIPSWeb/templates/index_old.html | 2 +-
applefruitmoth/templates/applefruitmoth/index.html | 2 +-
calculators/templates/calculators/eil.html | 2 +-
calculators/templates/calculators/index.html | 2 +-
.../templates/cerealblotchmodels/barleynetblotchform.html | 2 +-
cerealblotchmodels/templates/cerealblotchmodels/index.html | 2 +-
.../templates/cerealblotchmodels/septoriahumiditymodelform.html | 2 +-
.../templates/cerealblotchmodels/wheatleafblotchform.html | 2 +-
cydiapomonella/templates/cydiapomonella/index.html | 2 +-
forecasts/templates/forecasts/detail.html | 2 +-
forecasts/templates/forecasts/detail_error.html | 2 +-
forecasts/templates/forecasts/index.html | 2 +-
fusarium/templates/fusarium/oat_flowering.html | 2 +-
information/templates/information/detail.html | 2 +-
information/templates/information/index.html | 2 +-
observations/templates/observations/detail.html | 2 +-
observations/templates/observations/index.html | 2 +-
observations/templates/observations/index_old.html | 2 +-
requirements.txt | 2 +-
roughage/templates/roughage/nutrition.html | 2 +-
roughage/templates/roughage/nutrition_calibration.html | 2 +-
vips_messages/templates/messages/index.html | 2 +-
26 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/VIPSWeb/settings.py b/VIPSWeb/settings.py
index f1eb8948..ed6c09f7 100755
--- a/VIPSWeb/settings.py
+++ b/VIPSWeb/settings.py
@@ -85,7 +85,7 @@ MIDDLEWARE = (
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
- 'common.middleware.whodid.WhodidMiddleware',
+ #'common.middleware.whodid.WhodidMiddleware',
'django.middleware.locale.LocaleMiddleware',
'security.middleware.check_login_middleware.CheckLoginMiddleware'
# Uncomment the next line for simple clickjacking protection:
diff --git a/VIPSWeb/templates/base.html b/VIPSWeb/templates/base.html
index 1a1f6e1d..da90bf70 100755
--- a/VIPSWeb/templates/base.html
+++ b/VIPSWeb/templates/base.html
@@ -19,7 +19,7 @@
*
*/
-{% endcomment %}{% load i18n staticfiles template_helper %}<!DOCTYPE html>
+{% endcomment %}{% load i18n static template_helper %}<!DOCTYPE html>
<html lang="no">
<head>
<meta charset="utf-8">
diff --git a/VIPSWeb/templates/base_with_date_picker.html b/VIPSWeb/templates/base_with_date_picker.html
index 4802711c..784b3570 100755
--- a/VIPSWeb/templates/base_with_date_picker.html
+++ b/VIPSWeb/templates/base_with_date_picker.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
{% comment %}
/*
diff --git a/VIPSWeb/templates/index.html b/VIPSWeb/templates/index.html
index 7523c55e..e4604058 100755
--- a/VIPSWeb/templates/index.html
+++ b/VIPSWeb/templates/index.html
@@ -21,7 +21,7 @@
*/
{% endcomment %}
-{% load i18n l10n staticfiles forecast_extras template_helper %}
+{% load i18n l10n static forecast_extras template_helper %}
{% block title%}{% trans "Welcome" %}{%endblock%}
{% block customCSS %}
<link rel="stylesheet" href="{% static "css/3rdparty/ol.css" %}" type="text/css">
diff --git a/VIPSWeb/templates/index_old.html b/VIPSWeb/templates/index_old.html
index ada6a567..cd1a9bca 100755
--- a/VIPSWeb/templates/index_old.html
+++ b/VIPSWeb/templates/index_old.html
@@ -21,7 +21,7 @@
*/
{% endcomment %}
-{% load i18n l10n staticfiles forecast_extras template_helper %}
+{% load i18n l10n static forecast_extras template_helper %}
{% block title%}{% trans "Welcome" %}{%endblock%}
{% block customCSS %}
<link rel="stylesheet" href="{% static "css/3rdparty/ol.css" %}" type="text/css">
diff --git a/applefruitmoth/templates/applefruitmoth/index.html b/applefruitmoth/templates/applefruitmoth/index.html
index e4bcde15..4d2f2218 100755
--- a/applefruitmoth/templates/applefruitmoth/index.html
+++ b/applefruitmoth/templates/applefruitmoth/index.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
{% comment %}
#
diff --git a/calculators/templates/calculators/eil.html b/calculators/templates/calculators/eil.html
index 64063cf8..4b8fedb6 100755
--- a/calculators/templates/calculators/eil.html
+++ b/calculators/templates/calculators/eil.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
{% comment %}
#
diff --git a/calculators/templates/calculators/index.html b/calculators/templates/calculators/index.html
index a544cb7e..aa4e43a0 100755
--- a/calculators/templates/calculators/index.html
+++ b/calculators/templates/calculators/index.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
{% comment %}
#
diff --git a/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html b/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html
index d1e727ef..feb21cdc 100755
--- a/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html
+++ b/cerealblotchmodels/templates/cerealblotchmodels/barleynetblotchform.html
@@ -1,5 +1,5 @@
{% extends "base_with_date_picker.html" %}
-{% load staticfiles %}
+{% load static %}
{% comment %}
#
diff --git a/cerealblotchmodels/templates/cerealblotchmodels/index.html b/cerealblotchmodels/templates/cerealblotchmodels/index.html
index e34160dd..0f6f6445 100755
--- a/cerealblotchmodels/templates/cerealblotchmodels/index.html
+++ b/cerealblotchmodels/templates/cerealblotchmodels/index.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
{% comment %}
#
diff --git a/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html b/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html
index 44792cf0..8eb33998 100644
--- a/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html
+++ b/cerealblotchmodels/templates/cerealblotchmodels/septoriahumiditymodelform.html
@@ -1,5 +1,5 @@
{% extends "base_with_date_picker.html" %}
-{% load staticfiles %}
+{% load static %}
{% comment %}
#
diff --git a/cerealblotchmodels/templates/cerealblotchmodels/wheatleafblotchform.html b/cerealblotchmodels/templates/cerealblotchmodels/wheatleafblotchform.html
index 19322110..dd9c8e9a 100755
--- a/cerealblotchmodels/templates/cerealblotchmodels/wheatleafblotchform.html
+++ b/cerealblotchmodels/templates/cerealblotchmodels/wheatleafblotchform.html
@@ -1,5 +1,5 @@
{% extends "base_with_date_picker.html" %}
-{% load staticfiles %}
+{% load static %}
{% comment %}
#
diff --git a/cydiapomonella/templates/cydiapomonella/index.html b/cydiapomonella/templates/cydiapomonella/index.html
index 14494e78..a3885899 100644
--- a/cydiapomonella/templates/cydiapomonella/index.html
+++ b/cydiapomonella/templates/cydiapomonella/index.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
{% comment %}
#
diff --git a/forecasts/templates/forecasts/detail.html b/forecasts/templates/forecasts/detail.html
index d3b015a6..37466a56 100755
--- a/forecasts/templates/forecasts/detail.html
+++ b/forecasts/templates/forecasts/detail.html
@@ -21,7 +21,7 @@
# @author: Tor-Einar Skog
{% endcomment %}
-{% load i18n l10n staticfiles forecast_extras %}
+{% load i18n l10n static forecast_extras %}
{% block title%}{% trans "Details" %}{%endblock%}
{% block content %}
<h1>{% trans "Details" %}</h1>
diff --git a/forecasts/templates/forecasts/detail_error.html b/forecasts/templates/forecasts/detail_error.html
index 0e9259b9..37b3dca6 100755
--- a/forecasts/templates/forecasts/detail_error.html
+++ b/forecasts/templates/forecasts/detail_error.html
@@ -21,7 +21,7 @@
# @author: Tor-Einar Skog
{% endcomment %}
-{% load i18n l10n staticfiles forecast_extras %}
+{% load i18n l10n static forecast_extras %}
{% block title%}{% trans "Details" %}{%endblock%}
{% block content %}
<h1>{% trans "Error with details" %}</h1>
diff --git a/forecasts/templates/forecasts/index.html b/forecasts/templates/forecasts/index.html
index c6360412..0ecae3ae 100755
--- a/forecasts/templates/forecasts/index.html
+++ b/forecasts/templates/forecasts/index.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
{% comment %}
#
diff --git a/fusarium/templates/fusarium/oat_flowering.html b/fusarium/templates/fusarium/oat_flowering.html
index 39b537a3..7bdd13a8 100755
--- a/fusarium/templates/fusarium/oat_flowering.html
+++ b/fusarium/templates/fusarium/oat_flowering.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load i18n staticfiles %}
+{% load i18n static %}
{% block title%}{% trans "Oat flowering model" %}{%endblock%}
{% block extendCSS %}
diff --git a/information/templates/information/detail.html b/information/templates/information/detail.html
index a4e484c1..a4ed6528 100755
--- a/information/templates/information/detail.html
+++ b/information/templates/information/detail.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load i18n staticfiles %}
+{% load i18n static %}
{% block title%}{{information_locale.headline}}{%endblock%}
{% block content %}
<div class="col-md-3">
diff --git a/information/templates/information/index.html b/information/templates/information/index.html
index 3377f184..d7b7cb60 100755
--- a/information/templates/information/index.html
+++ b/information/templates/information/index.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load i18n staticfiles %}
+{% load i18n static %}
{% block title%}{% trans "Information" %}{%endblock%}
{% block content %}
<h1>{% trans "Information" %}</h1>
diff --git a/observations/templates/observations/detail.html b/observations/templates/observations/detail.html
index 49015d4e..bdce9dd9 100755
--- a/observations/templates/observations/detail.html
+++ b/observations/templates/observations/detail.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load i18n l10n staticfiles %}
+{% load i18n l10n static %}
{% comment %}
#
diff --git a/observations/templates/observations/index.html b/observations/templates/observations/index.html
index a8c6b84b..385083b0 100644
--- a/observations/templates/observations/index.html
+++ b/observations/templates/observations/index.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
{% comment %}
#
diff --git a/observations/templates/observations/index_old.html b/observations/templates/observations/index_old.html
index 6919283f..580cb9df 100755
--- a/observations/templates/observations/index_old.html
+++ b/observations/templates/observations/index_old.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
{% comment %}
#
diff --git a/requirements.txt b/requirements.txt
index ea2d224a..75acf710 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,7 +18,7 @@
# Please add requirements here
# Read docs for how this works: http://www.pip-installer.org/en/latest/cookbook.html
-Django==2.2.17
+Django==3.0.11
Pillow
requests==2.25.0
django-tinymce==2.8.0
diff --git a/roughage/templates/roughage/nutrition.html b/roughage/templates/roughage/nutrition.html
index 9bb409e5..037bcc95 100755
--- a/roughage/templates/roughage/nutrition.html
+++ b/roughage/templates/roughage/nutrition.html
@@ -20,7 +20,7 @@
#
# @author: Tor-Einar Skog
{% endcomment %}
-{% load i18n l10n staticfiles template_helper %}
+{% load i18n l10n static template_helper %}
{% block title%}{% trans "Roughage nutrition model" %}{%endblock%}
{% block content %}
<div class="singleBlockContainer">
diff --git a/roughage/templates/roughage/nutrition_calibration.html b/roughage/templates/roughage/nutrition_calibration.html
index adff5089..60c0798c 100644
--- a/roughage/templates/roughage/nutrition_calibration.html
+++ b/roughage/templates/roughage/nutrition_calibration.html
@@ -19,7 +19,7 @@
#
# @author: Tor-Einar Skog
{% endcomment %}
-{% load i18n l10n staticfiles template_helper %}
+{% load i18n l10n static template_helper %}
{% block title%}{% trans "Roughage nutrition model" %}{%endblock%}
{% block content %}
<div class="singleBlockContainer">
diff --git a/vips_messages/templates/messages/index.html b/vips_messages/templates/messages/index.html
index e754391c..6ea53081 100755
--- a/vips_messages/templates/messages/index.html
+++ b/vips_messages/templates/messages/index.html
@@ -1,5 +1,5 @@
{% extends "base_with_date_picker.html" %}
-{% load i18n staticfiles %}
+{% load i18n static %}
{% block title%}{% trans "Messages" %}{%endblock%}
{% block extendCSS %}
<link href="{% static "css/3rdparty/jquery-ui.min.css" %}" rel="stylesheet" media="screen" />
--
GitLab