thermokarst/ccdb-api
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MAINT: Upgrade to Django 1.11 (#45)

Browse source
This commit is contained in:
Matthew Ryan Dillon 2018-01-25 06:51:32 -07:00 • committed by GitHub
parent 17899ad7c7
commit a482019a81
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 101 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ccdb/misc/models.py
View file

@ -25,7 +25,8 @@ class MeasurementType(models.Model):
'MeasurementUnit',
blank=True,
null=True,
related_name='measurement_types'
related_name='measurement_types',
on_delete=models.CASCADE,
)
sort_order = models.IntegerField(blank=True, null=True)
@ -71,12 +72,15 @@ class Container(models.Model):
code = models.CharField(max_length=10, blank=True)
application = models.CharField(max_length=50, blank=True)
color = models.ForeignKey(Color, blank=True, null=True,
related_name='containers')
related_name='containers',
on_delete=models.CASCADE)
material = models.ForeignKey(Material, blank=True, null=True,
related_name='containers')
related_name='containers',
on_delete=models.CASCADE)
volume = models.FloatField(blank=True, null=True)
measurement_unit = models.ForeignKey(MeasurementUnit, blank=True,
null=True, related_name='containers')
null=True, related_name='containers',
on_delete=models.CASCADE)
sort_order = models.IntegerField(blank=True, null=True)
def __str__(self):