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

Migration step 3: Now compatible with Django 2.2

parent cd8426f4
No related branches found
No related tags found
1 merge request!8Upgrade to django 3.1
......@@ -106,6 +106,7 @@ TEMPLATES = [
'context_processors':[
'django.contrib.auth.context_processors.auth',
'django.template.context_processors.request',
'django.contrib.messages.context_processors.messages',
'VIPSWeb.context_processors.settings'
]
},
......
......@@ -36,7 +36,7 @@ class WhodidMiddleware(object):
def process_request(self, request):
if not request.method in ('GET', 'HEAD', 'OPTIONS', 'TRACE'):
if hasattr(request, 'user') and request.user.is_authenticated():
if hasattr(request, 'user') and request.user.is_authenticated:
user = request.user
else:
user = None
......
......@@ -501,6 +501,9 @@ class MeasurementUnit(models.Model):
opposite = models.BooleanField(default=False)
def __unicode__(self):
return self.name
def __str__(self):
return self.name
class Meta:
ordering = ['name']
......@@ -548,6 +551,9 @@ class HighChartsType(models.Model):
name = models.CharField(max_length=63)
def __unicode__(self):
return self.name
def __str__(self):
return self.name
class ModelGraphParameter(models.Model):
model_id = models.CharField(max_length=10, validators=[validate_model_id_length])
......@@ -557,3 +563,6 @@ class ModelGraphParameter(models.Model):
def __unicode__(self):
return self.model_id + "/" + self.resultparameter.getNamespaceKey()
def __str__(self):
return self.model_id + "/" + self.resultparameter.getNamespaceKey()
......@@ -10,6 +10,10 @@ from django.utils import translation
class Information(models.Model):
def __unicode__(self):
return InformationLocale.get_heading_with_fallback(self.id)
def __str__(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"),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"))
......
......@@ -192,6 +192,8 @@ class Message:
class Advertisement(models.Model):
def __unicode__(self):
return self.ad_heading
def __str__(self):
return self.ad_heading
""" Represents an advertisement to be shown on the frontpage """
ad_heading = models.CharField(max_length=200, verbose_name=_("Headline"))
ad_text = models.TextField()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment