Hopefully prepared everything for migration to Django 2.0

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()

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}),

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

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'),

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'),

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'),

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

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"))

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'),

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):

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'),
 ]

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'),

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'),

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)

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),

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'),