diff --git a/VIPSWeb/templatetags/template_helper.py b/VIPSWeb/templatetags/template_helper.py index 622867c27515991158ce5835e19e92132fdbcc9d..c13f9a90de57d1e2c20b43591c6060c6c7b8a43a 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 b368352680f3b982a88aaff3617f11c48fe4b022..c0ec1a85991189db120fcef646d12e77cd5c6808 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 d10f27647112c8b081813b4a802817cb942b542f..92ccac728202b4f6ced03a8c72aedcbdd283f192 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 210159ff8c15ba1b22b1d229ea9e23558f554d13..1661f2f18d47108c08e4b144d20ff8bb8903cf41 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 fc755c574502d1bd08b2222ba01fbba2b0404217..8a6bd76d63cdb53ffa12ea6a47d1146419095def 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 7a03d4b7a4127f159d92acad13ec687dae3b837f..ef8c0bb0d33bd68f5f977ea1d82cd288c3b06158 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 d0f606a5b778aadcecb95608e6fde472e7c1525b..e7b9cc8e48776a47e7771c8b163dde4813c5bb75 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 fb4b4211e0cca3e20dbb7700e2a3a74de2292c32..5b2871fc8d42c845ad02f0557b2be6e66c115798 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 cd17f675c3ea69988e5f126b639bb8232b740958..cbbea48875ea001a90f86ba14a4eb089ead9215c 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 d5abf1212713f245f9aed58b88e77fec0cec3a97..c330d5ef754376c15f8fefb25f974384dcfa3c6c 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 5ad9f0082bc0c85750606752c7f216f88df7d1fc..76901112a6860351b8028b43b081c6f01b4c2106 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 fd3672f80748ff583997699c9bf45f55a1956ac7..256641870add185a2fb11dd6ca3a79138a090706 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 467d9059f5a48e548ed0e8ca8a55a70d919ce2bf..5055042aa86db69e5cadfd2155738c001357f041 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 b59277f27a7f6198c59db5d7f320648018a27c2c..36a7163778fba5225c80ed79fd08176b72f8ad93 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 b594c3aea2dbebc9596e33bbfb029f9043171463..4e2f775711b99529740b961d85d8c4fa3f2a3a52 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 edc66b169439f04d4e324751ed744668f16120b0..38f1f499a52386887390998b318fc32b7ff3200a 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'),