From 50f2e4ca650c219604fb5373b50675dc76be3880 Mon Sep 17 00:00:00 2001
From: Tor-Einar Skog <tor-einar.skog@nibio.no>
Date: Mon, 23 Nov 2020 12:43:11 +0100
Subject: [PATCH] Hopefully prepared everything for migration to Django 2.0
---
VIPSWeb/templatetags/template_helper.py | 2 +-
VIPSWeb/urls.py | 2 +-
applefruitmoth/urls.py | 2 ++
calculators/urls.py | 2 ++
cerealblotchmodels/urls.py | 2 ++
forecasts/urls.py | 2 ++
fusarium/urls.py | 2 ++
information/models.py | 8 ++++----
information/urls.py | 2 ++
information/views.py | 2 +-
mock/urls.py | 3 +++
observations/urls.py | 2 ++
organisms/urls.py | 2 ++
roughage/urls.py | 2 ++
security/urls.py | 2 ++
vips_messages/urls.py | 2 ++
16 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/VIPSWeb/templatetags/template_helper.py b/VIPSWeb/templatetags/template_helper.py
index 622867c2..c13f9a90 100755
--- a/VIPSWeb/templatetags/template_helper.py
+++ b/VIPSWeb/templatetags/template_helper.py
@@ -5,7 +5,7 @@ from django.utils import translation
from django.conf import settings
from datetime import datetime
from dateutil.relativedelta import relativedelta
-from django.core.urlresolvers import reverse
+from django.urls import reverse
from django.utils.safestring import mark_safe
register = template.Library()
diff --git a/VIPSWeb/urls.py b/VIPSWeb/urls.py
index b3683526..c0ec1a85 100755
--- a/VIPSWeb/urls.py
+++ b/VIPSWeb/urls.py
@@ -63,7 +63,7 @@ else:
url(r'^applefruitmoth/', include('applefruitmoth.urls', namespace = "applefruitmoth")),
url(r'^mock/', include('mock.urls', namespace = "mock")),
# Uncomment the next line to enable the admin:
- url(r'^admin/', include(admin.site.urls)),
+ url(r'^admin/', admin.site.urls),
url(r'^tinymce/', include('tinymce.urls')),
# Static serving of media files
url(r'^media/(?P<path>.*)$', serve, {'document_root': settings.MEDIA_ROOT}),
diff --git a/applefruitmoth/urls.py b/applefruitmoth/urls.py
index d10f2764..92ccac72 100755
--- a/applefruitmoth/urls.py
+++ b/applefruitmoth/urls.py
@@ -20,6 +20,8 @@ from django.conf.urls import url
from applefruitmoth import views
+app_name = "applefruitmoth"
+
urlpatterns = [
url(r'^$', views.index, name='index'),
]
\ No newline at end of file
diff --git a/calculators/urls.py b/calculators/urls.py
index 210159ff..1661f2f1 100755
--- a/calculators/urls.py
+++ b/calculators/urls.py
@@ -18,6 +18,8 @@
from django.conf.urls import url
from calculators import views
+app_name = "calculators"
+
urlpatterns = [
# ex: /forecasts/
url(r'^$', views.index, name='index'),
diff --git a/cerealblotchmodels/urls.py b/cerealblotchmodels/urls.py
index fc755c57..8a6bd76d 100755
--- a/cerealblotchmodels/urls.py
+++ b/cerealblotchmodels/urls.py
@@ -18,6 +18,8 @@
from django.conf.urls import url
from cerealblotchmodels import views
+app_name = "cerealblotchmodels"
+
urlpatterns = [
# ex: /forecasts/
url(r'^$', views.index, name='index'),
diff --git a/forecasts/urls.py b/forecasts/urls.py
index 7a03d4b7..ef8c0bb0 100755
--- a/forecasts/urls.py
+++ b/forecasts/urls.py
@@ -20,6 +20,8 @@ from django.views.decorators.cache import cache_page
from forecasts import views
+app_name="forecasts"
+
urlpatterns = [
# ex: /forecasts/
url(r'^$', views.index, name='index'),
diff --git a/fusarium/urls.py b/fusarium/urls.py
index d0f606a5..e7b9cc8e 100755
--- a/fusarium/urls.py
+++ b/fusarium/urls.py
@@ -20,6 +20,8 @@ from django.conf.urls import url
from fusarium import views
+app_name = "fusarium"
+
urlpatterns = [
url(r'^$', views.index, name='index'),
]
\ No newline at end of file
diff --git a/information/models.py b/information/models.py
index fb4b4211..5b2871fc 100755
--- a/information/models.py
+++ b/information/models.py
@@ -10,22 +10,22 @@ from django.utils import translation
class Information(models.Model):
def __unicode__(self):
return InformationLocale.get_heading_with_fallback(self.id)
- parent_information = models.ForeignKey('self', blank=True, null=True, related_name='children', verbose_name=_("Parent information"))
+ parent_information = models.ForeignKey('self', blank=True, null=True, related_name='children', verbose_name=_("Parent information"),on_delete=models.CASCADE)
main_illustration = models.ImageField(upload_to='images/information', blank=True, verbose_name=_("Main illustration") )
ordering = models.IntegerField(default=0, verbose_name=_("Ordering"))
class Meta:
ordering = ["ordering"]
class InformationIllustration(models.Model):
- information = models.ForeignKey(Information)
+ information = models.ForeignKey(Information,on_delete=models.CASCADE)
illustration = models.ImageField(upload_to='images/information', blank=True, verbose_name=_("Illustration"))
class InformationAttachment(models.Model):
- information = models.ForeignKey(Information)
+ information = models.ForeignKey(Information,on_delete=models.CASCADE)
attachment = models.FileField(upload_to='attachments/information', blank=True, verbose_name=_("Attachment"))
class InformationLocale(models.Model):
- information = models.ForeignKey(Information)
+ information = models.ForeignKey(Information,on_delete=models.CASCADE)
headline = models.CharField(max_length=200, verbose_name=_("Headline"))
lead_paragraph = models.TextField(verbose_name=_("Lead paragraph"))
body = tinymce_models.HTMLField(verbose_name=_("Body text"))
diff --git a/information/urls.py b/information/urls.py
index cd17f675..cbbea488 100755
--- a/information/urls.py
+++ b/information/urls.py
@@ -20,6 +20,8 @@ from django.conf.urls import url
from information import views
+app_name = "information"
+
urlpatterns = [
# ex: /messages/
url(r'^$', views.index, name='index'),
diff --git a/information/views.py b/information/views.py
index d5abf121..c330d5ef 100755
--- a/information/views.py
+++ b/information/views.py
@@ -20,7 +20,7 @@ from django.shortcuts import render
from django.core.exceptions import ObjectDoesNotExist
from django.http import Http404
from information.models import InformationLocale, Information
-from django.core.urlresolvers import reverse
+from django.urls import reverse
def index(request):
diff --git a/mock/urls.py b/mock/urls.py
index 5ad9f008..76901112 100644
--- a/mock/urls.py
+++ b/mock/urls.py
@@ -18,6 +18,9 @@
from django.conf.urls import url
from mock import views
+
+app_name = "mock"
+
urlpatterns = [
url(r'^zymogridmapclient/$', views.zymogridmapclient, name='zymogridmapclient'),
]
diff --git a/observations/urls.py b/observations/urls.py
index fd3672f8..25664187 100755
--- a/observations/urls.py
+++ b/observations/urls.py
@@ -20,6 +20,8 @@ from django.conf.urls import url
from observations import views
+app_name = "observations"
+
urlpatterns = [
# ex: /forecasts/
url(r'^$', views.index, name='index'),
diff --git a/organisms/urls.py b/organisms/urls.py
index 467d9059..5055042a 100755
--- a/organisms/urls.py
+++ b/organisms/urls.py
@@ -20,6 +20,8 @@ from django.conf.urls import url
from organisms import views
+app_name = "organisms"
+
urlpatterns = [
# ex: /organisms/
url(r'^$', views.index, name='index'),
diff --git a/roughage/urls.py b/roughage/urls.py
index b59277f2..36a71637 100755
--- a/roughage/urls.py
+++ b/roughage/urls.py
@@ -20,6 +20,8 @@ from django.conf.urls import url
from roughage import views
+app_name = "roughage"
+
urlpatterns = [
url(r'^nutrition/calibration/$', views.nutrition_calibration),
url(r'^nutrition/$', views.nutrition)
diff --git a/security/urls.py b/security/urls.py
index b594c3ae..4e2f7757 100755
--- a/security/urls.py
+++ b/security/urls.py
@@ -20,6 +20,8 @@ from django.conf.urls import url
from security import views
+app_name = "security"
+
urlpatterns = [
url(r'^login/(?P<user_uuid>[^/]+)/$', views.login_user_uuid),
url(r'^login/$', views.login_form),
diff --git a/vips_messages/urls.py b/vips_messages/urls.py
index edc66b16..38f1f499 100755
--- a/vips_messages/urls.py
+++ b/vips_messages/urls.py
@@ -20,6 +20,8 @@ from django.conf.urls import url
from vips_messages import views
+app_name="vips_messages"
+
urlpatterns = [
# ex: /messages/
url(r'^$', views.index, name='index'),
--
GitLab