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

ALso for Django 2.0 upgrade

parent 50f2e4ca
No related branches found
No related tags found
1 merge request!8Upgrade to django 3.1
...@@ -509,7 +509,7 @@ class ResultParameter(models.Model): ...@@ -509,7 +509,7 @@ class ResultParameter(models.Model):
key = models.CharField(max_length=50) key = models.CharField(max_length=50)
name = models.CharField(max_length=200) name = models.CharField(max_length=200)
description = models.TextField() description = models.TextField()
measurementunit = models.ForeignKey(MeasurementUnit) measurementunit = models.ForeignKey(MeasurementUnit,on_delete=models.CASCADE)
local_name = None local_name = None
...@@ -536,7 +536,7 @@ class ResultParameter(models.Model): ...@@ -536,7 +536,7 @@ class ResultParameter(models.Model):
class ResultParameterLocal(models.Model): class ResultParameterLocal(models.Model):
result_parameter = models.ForeignKey(ResultParameter) result_parameter = models.ForeignKey(ResultParameter,on_delete=models.CASCADE)
local_name = models.CharField(max_length=200) local_name = models.CharField(max_length=200)
language_code = models.CharField(max_length=2, verbose_name=_("Language code")) language_code = models.CharField(max_length=2, verbose_name=_("Language code"))
...@@ -551,9 +551,9 @@ class HighChartsType(models.Model): ...@@ -551,9 +551,9 @@ class HighChartsType(models.Model):
class ModelGraphParameter(models.Model): class ModelGraphParameter(models.Model):
model_id = models.CharField(max_length=10, validators=[validate_model_id_length]) model_id = models.CharField(max_length=10, validators=[validate_model_id_length])
resultparameter = models.ForeignKey(ResultParameter) resultparameter = models.ForeignKey(ResultParameter,on_delete=models.CASCADE)
color_hexcode = models.CharField(max_length=6) color_hexcode = models.CharField(max_length=6)
highcharts_type = models.ForeignKey(HighChartsType) highcharts_type = models.ForeignKey(HighChartsType,on_delete=models.CASCADE)
def __unicode__(self): def __unicode__(self):
return self.model_id + "/" + self.resultparameter.getNamespaceKey() return self.model_id + "/" + self.resultparameter.getNamespaceKey()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment