Skip to content
Snippets Groups Projects
Commit 50f2e4ca authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Hopefully prepared everything for migration to Django 2.0

parent 0ce5f736
No related branches found
No related tags found
1 merge request!8Upgrade to django 3.1
...@@ -5,7 +5,7 @@ from django.utils import translation ...@@ -5,7 +5,7 @@ from django.utils import translation
from django.conf import settings from django.conf import settings
from datetime import datetime from datetime import datetime
from dateutil.relativedelta import relativedelta from dateutil.relativedelta import relativedelta
from django.core.urlresolvers import reverse from django.urls import reverse
from django.utils.safestring import mark_safe from django.utils.safestring import mark_safe
register = template.Library() register = template.Library()
......
...@@ -63,7 +63,7 @@ else: ...@@ -63,7 +63,7 @@ else:
url(r'^applefruitmoth/', include('applefruitmoth.urls', namespace = "applefruitmoth")), url(r'^applefruitmoth/', include('applefruitmoth.urls', namespace = "applefruitmoth")),
url(r'^mock/', include('mock.urls', namespace = "mock")), url(r'^mock/', include('mock.urls', namespace = "mock")),
# Uncomment the next line to enable the admin: # 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')), url(r'^tinymce/', include('tinymce.urls')),
# Static serving of media files # Static serving of media files
url(r'^media/(?P<path>.*)$', serve, {'document_root': settings.MEDIA_ROOT}), url(r'^media/(?P<path>.*)$', serve, {'document_root': settings.MEDIA_ROOT}),
......
...@@ -20,6 +20,8 @@ from django.conf.urls import url ...@@ -20,6 +20,8 @@ from django.conf.urls import url
from applefruitmoth import views from applefruitmoth import views
app_name = "applefruitmoth"
urlpatterns = [ urlpatterns = [
url(r'^$', views.index, name='index'), url(r'^$', views.index, name='index'),
] ]
\ No newline at end of file
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
from django.conf.urls import url from django.conf.urls import url
from calculators import views from calculators import views
app_name = "calculators"
urlpatterns = [ urlpatterns = [
# ex: /forecasts/ # ex: /forecasts/
url(r'^$', views.index, name='index'), url(r'^$', views.index, name='index'),
......
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
from django.conf.urls import url from django.conf.urls import url
from cerealblotchmodels import views from cerealblotchmodels import views
app_name = "cerealblotchmodels"
urlpatterns = [ urlpatterns = [
# ex: /forecasts/ # ex: /forecasts/
url(r'^$', views.index, name='index'), url(r'^$', views.index, name='index'),
......
...@@ -20,6 +20,8 @@ from django.views.decorators.cache import cache_page ...@@ -20,6 +20,8 @@ from django.views.decorators.cache import cache_page
from forecasts import views from forecasts import views
app_name="forecasts"
urlpatterns = [ urlpatterns = [
# ex: /forecasts/ # ex: /forecasts/
url(r'^$', views.index, name='index'), url(r'^$', views.index, name='index'),
......
...@@ -20,6 +20,8 @@ from django.conf.urls import url ...@@ -20,6 +20,8 @@ from django.conf.urls import url
from fusarium import views from fusarium import views
app_name = "fusarium"
urlpatterns = [ urlpatterns = [
url(r'^$', views.index, name='index'), url(r'^$', views.index, name='index'),
] ]
\ No newline at end of file
...@@ -10,22 +10,22 @@ from django.utils import translation ...@@ -10,22 +10,22 @@ from django.utils import translation
class Information(models.Model): class Information(models.Model):
def __unicode__(self): def __unicode__(self):
return InformationLocale.get_heading_with_fallback(self.id) 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") ) main_illustration = models.ImageField(upload_to='images/information', blank=True, verbose_name=_("Main illustration") )
ordering = models.IntegerField(default=0, verbose_name=_("Ordering")) ordering = models.IntegerField(default=0, verbose_name=_("Ordering"))
class Meta: class Meta:
ordering = ["ordering"] ordering = ["ordering"]
class InformationIllustration(models.Model): 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")) illustration = models.ImageField(upload_to='images/information', blank=True, verbose_name=_("Illustration"))
class InformationAttachment(models.Model): 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")) attachment = models.FileField(upload_to='attachments/information', blank=True, verbose_name=_("Attachment"))
class InformationLocale(models.Model): 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")) headline = models.CharField(max_length=200, verbose_name=_("Headline"))
lead_paragraph = models.TextField(verbose_name=_("Lead paragraph")) lead_paragraph = models.TextField(verbose_name=_("Lead paragraph"))
body = tinymce_models.HTMLField(verbose_name=_("Body text")) body = tinymce_models.HTMLField(verbose_name=_("Body text"))
......
...@@ -20,6 +20,8 @@ from django.conf.urls import url ...@@ -20,6 +20,8 @@ from django.conf.urls import url
from information import views from information import views
app_name = "information"
urlpatterns = [ urlpatterns = [
# ex: /messages/ # ex: /messages/
url(r'^$', views.index, name='index'), url(r'^$', views.index, name='index'),
......
...@@ -20,7 +20,7 @@ from django.shortcuts import render ...@@ -20,7 +20,7 @@ from django.shortcuts import render
from django.core.exceptions import ObjectDoesNotExist from django.core.exceptions import ObjectDoesNotExist
from django.http import Http404 from django.http import Http404
from information.models import InformationLocale, Information from information.models import InformationLocale, Information
from django.core.urlresolvers import reverse from django.urls import reverse
def index(request): def index(request):
......
...@@ -18,6 +18,9 @@ ...@@ -18,6 +18,9 @@
from django.conf.urls import url from django.conf.urls import url
from mock import views from mock import views
app_name = "mock"
urlpatterns = [ urlpatterns = [
url(r'^zymogridmapclient/$', views.zymogridmapclient, name='zymogridmapclient'), url(r'^zymogridmapclient/$', views.zymogridmapclient, name='zymogridmapclient'),
] ]
...@@ -20,6 +20,8 @@ from django.conf.urls import url ...@@ -20,6 +20,8 @@ from django.conf.urls import url
from observations import views from observations import views
app_name = "observations"
urlpatterns = [ urlpatterns = [
# ex: /forecasts/ # ex: /forecasts/
url(r'^$', views.index, name='index'), url(r'^$', views.index, name='index'),
......
...@@ -20,6 +20,8 @@ from django.conf.urls import url ...@@ -20,6 +20,8 @@ from django.conf.urls import url
from organisms import views from organisms import views
app_name = "organisms"
urlpatterns = [ urlpatterns = [
# ex: /organisms/ # ex: /organisms/
url(r'^$', views.index, name='index'), url(r'^$', views.index, name='index'),
......
...@@ -20,6 +20,8 @@ from django.conf.urls import url ...@@ -20,6 +20,8 @@ from django.conf.urls import url
from roughage import views from roughage import views
app_name = "roughage"
urlpatterns = [ urlpatterns = [
url(r'^nutrition/calibration/$', views.nutrition_calibration), url(r'^nutrition/calibration/$', views.nutrition_calibration),
url(r'^nutrition/$', views.nutrition) url(r'^nutrition/$', views.nutrition)
......
...@@ -20,6 +20,8 @@ from django.conf.urls import url ...@@ -20,6 +20,8 @@ from django.conf.urls import url
from security import views from security import views
app_name = "security"
urlpatterns = [ urlpatterns = [
url(r'^login/(?P<user_uuid>[^/]+)/$', views.login_user_uuid), url(r'^login/(?P<user_uuid>[^/]+)/$', views.login_user_uuid),
url(r'^login/$', views.login_form), url(r'^login/$', views.login_form),
......
...@@ -20,6 +20,8 @@ from django.conf.urls import url ...@@ -20,6 +20,8 @@ from django.conf.urls import url
from vips_messages import views from vips_messages import views
app_name="vips_messages"
urlpatterns = [ urlpatterns = [
# ex: /messages/ # ex: /messages/
url(r'^$', views.index, name='index'), url(r'^$', views.index, name='index'),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment