Self hosted FLOSS fitness/workout, nutrition and weight tracker
Fix RemovedInDjango20Warning
Scott Peshakdeda4a090f38
diff --git a/wger/config/migrations/0001_initial.py b/wger/config/migrations/0001_initial.pyindex f39acc22a..4ee43e453 100644--- a/wger/config/migrations/0001_initial.py+++ b/wger/config/migrations/0001_initial.py@@ -16,7 +16,9 @@ class Migration(migrations.Migration):name='GymConfig',fields=[('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),- ('default_gym', models.ForeignKey(blank=True, to='gym.Gym', help_text='Select the default gym for this installation. This will assign all new registered users to this gym and update all existing users without a gym.', null=True, verbose_name='Default gym')),+ ('default_gym', models.ForeignKey(blank=True, to='gym.Gym',+ help_text='Select the default gym for this installation. This will assign all new registered users to this gym and update all existing users without a gym.',+ null=True, verbose_name='Default gym', on_delete=models.CASCADE)),],options={},@@ -28,8 +30,8 @@ class Migration(migrations.Migration):('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),('item', models.CharField(max_length=2, editable=False, choices=[(b'1', 'Exercises'), (b'2', 'Ingredients')])),('show', models.BooleanField(default=1)),- ('language', models.ForeignKey(related_name='language_source', editable=False, to='core.Language')),- ('language_target', models.ForeignKey(related_name='language_target', editable=False, to='core.Language')),+ ('language', models.ForeignKey(related_name='language_source', editable=False, to='core.Language', on_delete=models.CASCADE)),+ ('language_target', models.ForeignKey(related_name='language_target', editable=False, to='core.Language', on_delete=models.CASCADE)),],options={'ordering': ['item', 'language_target'],diff --git a/wger/config/models.py b/wger/config/models.pyindex 2299dd9b4..54ea0f652 100644--- a/wger/config/models.py+++ b/wger/config/models.py@@ -59,10 +59,12 @@ class LanguageConfig(models.Model):language = models.ForeignKey(Language,related_name='language_source',- editable=False)+ editable=False,+ on_delete=models.CASCADE)language_target = models.ForeignKey(Language,related_name='language_target',- editable=False)+ editable=False,+ on_delete=models.CASCADE)item = models.CharField(max_length=2,choices=SHOW_ITEM_LIST,editable=False)@@ -125,7 +127,8 @@ class GymConfig(models.Model):'gym and update all existing users without a ''gym.'),null=True,- blank=True)+ blank=True,+ on_delete=models.CASCADE)'''Default gym for the wger installation'''diff --git a/wger/core/migrations/0001_initial.py b/wger/core/migrations/0001_initial.pyindex 0e494880b..3f663e6ab 100644--- a/wger/core/migrations/0001_initial.py+++ b/wger/core/migrations/0001_initial.py@@ -75,9 +75,9 @@ class Migration(migrations.Migration):('freetime_intensity', models.CharField(default=b'1', choices=[(b'1', 'Low'), (b'2', 'Medium'), (b'3', 'High')], max_length=1, help_text='Approximately', null=True, verbose_name='Physical intensity')),('calories', models.IntegerField(default=2500, help_text='Total caloric intake, including e.g. any surplus', null=True, verbose_name='Total daily calories', validators=[django.core.validators.MinValueValidator(1500), django.core.validators.MaxValueValidator(5000)])),('weight_unit', models.CharField(default=b'kg', max_length=2, verbose_name='Weight unit', choices=[(b'kg', 'Metric (kilogram)'), (b'lb', 'Imperial (pound)')])),- ('gym', models.ForeignKey(blank=True, editable=False, to='gym.Gym', null=True)),- ('notification_language', models.ForeignKey(default=2, verbose_name='Notification language', to='core.Language', help_text='Language to use when sending you email notifications, e.g. email reminders for workouts. This does not affect the language used on the website.')),- ('user', models.OneToOneField(editable=False, to=settings.AUTH_USER_MODEL)),+ ('gym', models.ForeignKey(blank=True, editable=False, to='gym.Gym', null=True, on_delete=models.CASCADE)),+ ('notification_language', models.ForeignKey(default=2, verbose_name='Notification language', to='core.Language', help_text='Language to use when sending you email notifications, e.g. email reminders for workouts. This does not affect the language used on the website.', on_delete=models.CASCADE)),+ ('user', models.OneToOneField(editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),],options={},diff --git a/wger/core/migrations/0005_auto_20151025_2236.py b/wger/core/migrations/0005_auto_20151025_2236.pyindex b76a4072a..82d7e6d05 100644--- a/wger/core/migrations/0005_auto_20151025_2236.py+++ b/wger/core/migrations/0005_auto_20151025_2236.py@@ -19,7 +19,7 @@ class Migration(migrations.Migration):fields=[('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),('last_activity', models.DateField(null=True)),- ('user', models.OneToOneField(editable=False, to=settings.AUTH_USER_MODEL)),+ ('user', models.OneToOneField(editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),],),migrations.AlterField(diff --git a/wger/core/models.py b/wger/core/models.pyindex 0b2906132..2f16c44bf 100644--- a/wger/core/models.py+++ b/wger/core/models.py@@ -124,7 +124,8 @@ class UserProfile(models.Model):)user = models.OneToOneField(User,- editable=False)+ editable=False,+ on_delete=models.CASCADE)'''The user'''@@ -132,7 +133,8 @@ class UserProfile(models.Model):gym = models.ForeignKey(Gym,editable=False,null=True,- blank=True)+ blank=True,+ on_delete=models.CASCADE)'''The gym this user belongs to, if any'''@@ -199,7 +201,8 @@ by the US Department of Agriculture. It is extremely complete, with around'notifications, e.g. email reminders for ''workouts. This does not affect the ''language used on the website.'),- default=2)+ default=2,+ on_delete=models.CASCADE)timer_active = models.BooleanField(verbose_name=_('Use pauses in workout timer'),help_text=_('Check to activate timer pauses between '@@ -506,7 +509,7 @@ class UserCache(models.Model):A table used to cache expensive queries or similar'''- user = models.OneToOneField(User, editable=False)+ user = models.OneToOneField(User, editable=False, on_delete=models.CASCADE)'''The user'''diff --git a/wger/email/migrations/0001_initial.py b/wger/email/migrations/0001_initial.pyindex 3c1f13f01..aa75b81a5 100644--- a/wger/email/migrations/0001_initial.py+++ b/wger/email/migrations/0001_initial.py@@ -27,13 +27,13 @@ class Migration(migrations.Migration):('date', models.DateField(auto_now=True)),('subject', models.CharField(max_length=100)),('body', models.TextField()),- ('gym', models.ForeignKey(editable=False, to='gym.Gym')),- ('user', models.ForeignKey(editable=False, to=settings.AUTH_USER_MODEL)),+ ('gym', models.ForeignKey(editable=False, to='gym.Gym', on_delete=models.CASCADE)),+ ('user', models.ForeignKey(editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),],),migrations.AddField(model_name='cronentry',name='log',- field=models.ForeignKey(editable=False, to='email.Log'),+ field=models.ForeignKey(editable=False, to='email.Log', on_delete=models.CASCADE),),]diff --git a/wger/email/models.py b/wger/email/models.pyindex 751c53e8a..96e332e5c 100644--- a/wger/email/models.py+++ b/wger/email/models.py@@ -36,15 +36,16 @@ class Log(models.Model):'''user = models.ForeignKey(User,- editable=False)+ editable=False,+ on_delete=models.CASCADE)'''The user that created the email'''gym = models.ForeignKey(Gym,editable=False,- related_name='email_log'- )+ related_name='email_log',+ on_delete=models.CASCADE)'''Gym this log belongs to'''@@ -72,7 +73,8 @@ class CronEntry(models.Model):'''log = models.ForeignKey(Log,- editable=False)+ editable=False,+ on_delete=models.CASCADE)'''Foreign key to email log with subject and body'''diff --git a/wger/exercises/migrations/0001_initial.py b/wger/exercises/migrations/0001_initial.pyindex ecc44c6ed..698fe5259 100644--- a/wger/exercises/migrations/0001_initial.py+++ b/wger/exercises/migrations/0001_initial.py@@ -56,7 +56,7 @@ class Migration(migrations.Migration):fields=[('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),('comment', models.CharField(help_text='A comment about how to correctly do this exercise.', max_length=200, verbose_name='Comment')),- ('exercise', models.ForeignKey(editable=False, to='exercises.Exercise', verbose_name='Exercise')),+ ('exercise', models.ForeignKey(editable=False, to='exercises.Exercise', verbose_name='Exercise', on_delete=models.CASCADE)),],options={},@@ -70,8 +70,8 @@ class Migration(migrations.Migration):('status', models.CharField(default=b'1', max_length=2, editable=False, choices=[(b'1', 'Pending'), (b'2', 'Accepted'), (b'3', 'Declined')])),('image', models.ImageField(help_text='Only PNG and JPEG formats are supported', upload_to=wger.exercises.models.exercise_image_upload_dir, verbose_name='Image')),('is_main', models.BooleanField(default=False, help_text='Tick the box if you want to set this image as the main one for the exercise (will be shown e.g. in the search). The first image is automatically marked by the system.', verbose_name='Is main picture')),- ('exercise', models.ForeignKey(verbose_name='Exercise', to='exercises.Exercise')),- ('license', models.ForeignKey(default=2, verbose_name='License', to='core.License')),+ ('exercise', models.ForeignKey(verbose_name='Exercise', to='exercises.Exercise', on_delete=models.CASCADE)),+ ('license', models.ForeignKey(default=2, verbose_name='License', to='core.License', on_delete=models.CASCADE)),],options={'ordering': ['-is_main', 'id'],@@ -93,7 +93,7 @@ class Migration(migrations.Migration):migrations.AddField(model_name='exercise',name='category',- field=models.ForeignKey(verbose_name='Category', to='exercises.ExerciseCategory'),+ field=models.ForeignKey(verbose_name='Category', to='exercises.ExerciseCategory', on_delete=models.CASCADE),preserve_default=True,),migrations.AddField(@@ -105,13 +105,13 @@ class Migration(migrations.Migration):migrations.AddField(model_name='exercise',name='language',- field=models.ForeignKey(verbose_name='Language', to='core.Language'),+ field=models.ForeignKey(verbose_name='Language', to='core.Language', on_delete=models.CASCADE),preserve_default=True,),migrations.AddField(model_name='exercise',name='license',- field=models.ForeignKey(default=2, verbose_name='License', to='core.License'),+ field=models.ForeignKey(default=2, verbose_name='License', to='core.License', on_delete=models.CASCADE),preserve_default=True,),migrations.AddField(diff --git a/wger/exercises/models.py b/wger/exercises/models.pyindex 54d47ffd9..5377c9a1c 100644--- a/wger/exercises/models.py+++ b/wger/exercises/models.py@@ -170,7 +170,8 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):'''Custom manager'''category = models.ForeignKey(ExerciseCategory,- verbose_name=_('Category'))+ verbose_name=_('Category'),+ on_delete=models.CASCADE)description = models.TextField(max_length=2000,verbose_name=_('Description'),validators=[MinLengthValidator(40)])@@ -208,7 +209,8 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):'''The submission date'''language = models.ForeignKey(Language,- verbose_name=_('Language'))+ verbose_name=_('Language'),+ on_delete=models.CASCADE)'''The exercise's language'''uuid = models.UUIDField(default=uuid.uuid4, editable=False, verbose_name='UUID')@@ -364,7 +366,8 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)'''Custom manager'''exercise = models.ForeignKey(Exercise,- verbose_name=_('Exercise'))+ verbose_name=_('Exercise'),+ on_delete=models.CASCADE)'''The exercise the image belongs to'''image = models.ImageField(verbose_name=_('Image'),@@ -475,7 +478,8 @@ class ExerciseComment(models.Model):'''exercise = models.ForeignKey(Exercise,verbose_name=_('Exercise'),- editable=False)+ editable=False,+ on_delete=models.CASCADE)comment = models.CharField(max_length=200,verbose_name=_('Comment'),help_text=_('A comment about how to correctly do this exercise.'))diff --git a/wger/gym/migrations/0001_initial.py b/wger/gym/migrations/0001_initial.pyindex 28b520b6f..9d7779770 100644--- a/wger/gym/migrations/0001_initial.py+++ b/wger/gym/migrations/0001_initial.py@@ -20,8 +20,8 @@ class Migration(migrations.Migration):('timestamp_created', models.DateTimeField(auto_now_add=True)),('timestamp_edited', models.DateTimeField(auto_now=True)),('note', models.TextField(verbose_name='Note')),- ('member', models.ForeignKey(related_name='adminusernote_member', editable=False, to=settings.AUTH_USER_MODEL)),- ('user', models.ForeignKey(related_name='adminusernote_user', editable=False, to=settings.AUTH_USER_MODEL)),+ ('member', models.ForeignKey(related_name='adminusernote_member', editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),+ ('user', models.ForeignKey(related_name='adminusernote_user', editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),],options={'ordering': ['-timestamp_created'],@@ -51,8 +51,8 @@ class Migration(migrations.Migration):fields=[('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),('overview_inactive', models.BooleanField(default=True, help_text='Receive email overviews of inactive members', verbose_name='Overview inactive members')),- ('gym', models.ForeignKey(editable=False, to='gym.Gym')),- ('user', models.OneToOneField(editable=False, to=settings.AUTH_USER_MODEL)),+ ('gym', models.ForeignKey(editable=False, to='gym.Gym', on_delete=models.CASCADE)),+ ('user', models.OneToOneField(editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),],options={},@@ -63,7 +63,7 @@ class Migration(migrations.Migration):fields=[('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),('weeks_inactive', models.PositiveIntegerField(default=4, help_text='Number of weeks since the last time a user logged his presence to be considered inactive', max_length=2, verbose_name='Reminder inactive members')),- ('gym', models.OneToOneField(related_name='config', editable=False, to='gym.Gym')),+ ('gym', models.OneToOneField(related_name='config', editable=False, to='gym.Gym', on_delete=models.CASCADE)),],options={},@@ -74,8 +74,8 @@ class Migration(migrations.Migration):fields=[('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),('include_inactive', models.BooleanField(default=True, help_text='Include this user in the email list with inactive members', verbose_name='Include in inactive overview')),- ('gym', models.ForeignKey(editable=False, to='gym.Gym')),- ('user', models.OneToOneField(editable=False, to=settings.AUTH_USER_MODEL)),+ ('gym', models.ForeignKey(editable=False, to='gym.Gym', on_delete=models.CASCADE)),+ ('user', models.OneToOneField(editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),],options={},@@ -91,8 +91,8 @@ class Migration(migrations.Migration):('original_name', models.CharField(max_length=128, editable=False)),('name', models.CharField(help_text='Will use file name if nothing provided', max_length=60, verbose_name='Name', blank=True)),('note', models.TextField(null=True, verbose_name='Note', blank=True)),- ('member', models.ForeignKey(related_name='userdocument_member', editable=False, to=settings.AUTH_USER_MODEL)),- ('user', models.ForeignKey(related_name='userdocument_user', editable=False, to=settings.AUTH_USER_MODEL)),+ ('member', models.ForeignKey(related_name='userdocument_member', editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),+ ('user', models.ForeignKey(related_name='userdocument_user', editable=False, to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),],options={'ordering': ['-timestamp_created'],diff --git a/wger/gym/migrations/0003_auto_20151003_2008.py b/wger/gym/migrations/0003_auto_20151003_2008.pyindex 8eff7b4de..7879f8f31 100644--- a/wger/gym/migrations/0003_auto_20151003_2008.py+++ b/wger/gym/migrations/0003_auto_20151003_2008.py@@ -43,22 +43,22 @@ class Migration(migrations.Migration):('id', models.AutoField(auto_created=True, verbose_name='ID', serialize=False, primary_key=True)),('name', models.CharField(verbose_name='Name', max_length=25)),('description', models.TextField(verbose_name='Description', blank=True, null=True)),- ('gym', models.ForeignKey(to='gym.Gym', editable=False)),+ ('gym', models.ForeignKey(to='gym.Gym', editable=False, on_delete=models.CASCADE)),],),migrations.AddField(model_name='contract',name='contract_type',- field=models.ForeignKey(verbose_name='Contract type', blank=True, null=True, to='gym.ContractType'),+ field=models.ForeignKey(verbose_name='Contract type', blank=True, null=True, to='gym.ContractType', on_delete=models.CASCADE),),migrations.AddField(model_name='contract',name='member',- field=models.ForeignKey(editable=False, to=settings.AUTH_USER_MODEL, related_name='contract_member'),+ field=models.ForeignKey(editable=False, to=settings.AUTH_USER_MODEL, related_name='contract_member', on_delete=models.CASCADE),),migrations.AddField(model_name='contract',name='user',- field=models.ForeignKey(editable=False, to=settings.AUTH_USER_MODEL, related_name='contract_user'),+ field=models.ForeignKey(editable=False, to=settings.AUTH_USER_MODEL, related_name='contract_user', on_delete=models.CASCADE),),]diff --git a/wger/gym/migrations/0005_auto_20151023_1522.py b/wger/gym/migrations/0005_auto_20151023_1522.pyindex 3726cb293..4ce9bf8d7 100644--- a/wger/gym/migrations/0005_auto_20151023_1522.py+++ b/wger/gym/migrations/0005_auto_20151023_1522.py@@ -17,7 +17,7 @@ class Migration(migrations.Migration):('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),('name', models.CharField(max_length=25, verbose_name='Name')),('description', models.TextField(null=True, verbose_name='Description', blank=True)),- ('gym', models.ForeignKey(editable=False, to='gym.Gym')),+ ('gym', models.ForeignKey(editable=False, to='gym.Gym', on_delete=models.CASCADE)),],options={'ordering': ['name'],diff --git a/wger/gym/models.py b/wger/gym/models.pyindex 47b6b7f30..3ac4694d3 100644--- a/wger/gym/models.py+++ b/wger/gym/models.py@@ -128,7 +128,8 @@ class GymConfig(m.Model):gym = m.OneToOneField(Gym,related_name='config',- editable=False)+ editable=False,+ on_delete=m.CASCADE)'''Gym this configuration belongs to'''@@ -170,13 +171,15 @@ class AbstractGymUserConfigModel(m.Model):abstract = Truegym = m.ForeignKey(Gym,- editable=False)+ editable=False,+ on_delete=m.CASCADE)'''Gym this configuration belongs to'''user = m.OneToOneField(User,- editable=False)+ editable=False,+ on_delete=m.CASCADE)'''User this configuration belongs to'''@@ -247,14 +250,16 @@ class AdminUserNote(m.Model):user = m.ForeignKey(User,editable=False,- related_name='adminusernote_user')+ related_name='adminusernote_user',+ on_delete=m.CASCADE)'''User this note belongs to'''member = m.ForeignKey(User,editable=False,- related_name='adminusernote_member')+ related_name='adminusernote_member',+ on_delete=m.CASCADE)'''Gym member this note refers to'''@@ -305,14 +310,16 @@ class UserDocument(m.Model):user = m.ForeignKey(User,editable=False,- related_name='userdocument_user')+ related_name='userdocument_user',+ on_delete=m.CASCADE)'''User this note belongs to'''member = m.ForeignKey(User,editable=False,- related_name='userdocument_member')+ related_name='userdocument_member',+ on_delete=m.CASCADE)'''Gym member this note refers to'''@@ -387,7 +394,8 @@ class ContractType(m.Model):ordering = ["name", ]gym = m.ForeignKey(Gym,- editable=False)+ editable=False,+ on_delete=m.CASCADE)'''The gym this contract type belongs to'''@@ -436,7 +444,8 @@ class ContractOption(m.Model):ordering = ["name", ]gym = m.ForeignKey(Gym,- editable=False)+ editable=False,+ on_delete=m.CASCADE)'''The gym this contract option belongs to'''@@ -497,14 +506,16 @@ class Contract(m.Model):user = m.ForeignKey(User,editable=False,- related_name='contract_user')+ related_name='contract_user',+ on_delete=m.CASCADE)'''User that originally created the contract'''member = m.ForeignKey(User,editable=False,- related_name='contract_member')+ related_name='contract_member',+ on_delete=m.CASCADE)'''Gym member this contract refers to'''@@ -522,7 +533,8 @@ class Contract(m.Model):contract_type = m.ForeignKey(ContractType,blank=True,null=True,- verbose_name=_('Contract type'))+ verbose_name=_('Contract type'),+ on_delete=m.CASCADE)'''Optional type of contract'''diff --git a/wger/manager/migrations/0001_initial.py b/wger/manager/migrations/0001_initial.pyindex c66713609..fdce6b0ec 100644--- a/wger/manager/migrations/0001_initial.py+++ b/wger/manager/migrations/0001_initial.py@@ -36,7 +36,7 @@ class Migration(migrations.Migration):('start_date', wger.utils.fields.Html5DateField(default=datetime.date.today, verbose_name='Start date')),('is_active', models.BooleanField(default=True, help_text='Tick the box if you want to mark this schedule as your active one (will be shown e.g. on your dashboard). All other schedules will then be marked as inactive', verbose_name='Schedule active')),('is_loop', models.BooleanField(default=False, help_text='Tick the box if you want to repeat the schedules in a loop (i.e. A, B, C, A, B, C, and so on)', verbose_name='Is loop')),- ('user', models.ForeignKey(editable=False, to=settings.AUTH_USER_MODEL, verbose_name='User')),+ ('user', models.ForeignKey(editable=False, to=settings.AUTH_USER_MODEL, verbose_name='User', on_delete=models.CASCADE)),],options={},@@ -48,7 +48,7 @@ class Migration(migrations.Migration):('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),('duration', models.IntegerField(default=4, help_text='The duration in weeks', verbose_name='Duration', validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(25)])),('order', models.IntegerField(default=1, max_length=1, verbose_name='Order')),- ('schedule', models.ForeignKey(verbose_name='schedule', to='manager.Schedule')),+ ('schedule', models.ForeignKey(verbose_name='schedule', to='manager.Schedule', on_delete=models.CASCADE)),],options={'ordering': ['order'],@@ -61,7 +61,7 @@ class Migration(migrations.Migration):('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),('order', models.IntegerField(null=True, verbose_name='Order', blank=True)),('sets', models.IntegerField(default=4, verbose_name='Number of sets', validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(10)])),- ('exerciseday', models.ForeignKey(verbose_name='Exercise day', to='manager.Day')),+ ('exerciseday', models.ForeignKey(verbose_name='Exercise day', to='manager.Day', on_delete=models.CASCADE)),('exercises', models.ManyToManyField(to='exercises.Exercise', verbose_name='Exercises')),],options={@@ -76,8 +76,8 @@ class Migration(migrations.Migration):('reps', models.IntegerField(verbose_name='Repetitions', validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)])),('order', models.IntegerField(verbose_name='Order', blank=True)),('comment', models.CharField(max_length=100, verbose_name='Comment', blank=True)),- ('exercise', models.ForeignKey(verbose_name='Exercises', to='exercises.Exercise')),- ('set', models.ForeignKey(verbose_name='Sets', to='manager.Set')),+ ('exercise', models.ForeignKey(verbose_name='Exercises', to='exercises.Exercise', on_delete=models.CASCADE)),+ ('set', models.ForeignKey(verbose_name='Sets', to='manager.Set', on_delete=models.CASCADE)),],options={'ordering': ['order', 'id'],@@ -90,7 +90,7 @@ class Migration(migrations.Migration):('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),('creation_date', models.DateField(auto_now_add=True, verbose_name='Creation date')),('comment', models.CharField(help_text="A short description or goal of the workout. For example 'Focus on back' or 'Week 1 of program xy'.", max_length=100, verbose_name='Description', blank=True)),- ('user', models.ForeignKey(verbose_name='User', to=settings.AUTH_USER_MODEL)),+ ('user', models.ForeignKey(verbose_name='User', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),],options={'ordering': ['-creation_date'],@@ -104,9 +104,9 @@ class Migration(migrations.Migration):('reps', models.IntegerField(verbose_name='Repetitions', validators=[django.core.validators.MinValueValidator(0)])),('weight', models.DecimalField(verbose_name='Weight', max_digits=5, decimal_places=2, validators=[django.core.validators.MinValueValidator(0)])),('date', wger.utils.fields.Html5DateField(verbose_name='Date')),- ('exercise', models.ForeignKey(verbose_name='Exercise', to='exercises.Exercise')),- ('user', models.ForeignKey(editable=False, to=settings.AUTH_USER_MODEL, verbose_name='User')),- ('workout', models.ForeignKey(verbose_name='Workout', to='manager.Workout')),+ ('exercise', models.ForeignKey(verbose_name='Exercise', to='exercises.Exercise', on_delete=models.CASCADE)),+ ('user', models.ForeignKey(editable=False, to=settings.AUTH_USER_MODEL, verbose_name='User', on_delete=models.CASCADE)),+ ('workout', models.ForeignKey(verbose_name='Workout', to='manager.Workout', on_delete=models.CASCADE)),],options={'ordering': ['date', 'reps'],@@ -122,8 +122,8 @@ class Migration(migrations.Migration):('impression', models.CharField(default=b'2', help_text='Your impression about this workout session. Did you exercise as well as you could?', max_length=2, verbose_name='General impression', choices=[(b'1', 'Bad'), (b'2', 'Neutral'), (b'3', 'Good')])),('time_start', models.TimeField(null=True, verbose_name='Start time', blank=True)),('time_end', models.TimeField(null=True, verbose_name='Finish time', blank=True)),- ('user', models.ForeignKey(verbose_name='User', to=settings.AUTH_USER_MODEL)),- ('workout', models.ForeignKey(verbose_name='Workout', to='manager.Workout')),+ ('user', models.ForeignKey(verbose_name='User', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),+ ('workout', models.ForeignKey(verbose_name='Workout', to='manager.Workout', on_delete=models.CASCADE)),],options={'ordering': ['date'],@@ -137,13 +137,13 @@ class Migration(migrations.Migration):migrations.AddField(model_name='schedulestep',name='workout',- field=models.ForeignKey(to='manager.Workout'),+ field=models.ForeignKey(to='manager.Workout', on_delete=models.CASCADE),preserve_default=True,),migrations.AddField(model_name='day',name='training',- field=models.ForeignKey(verbose_name='Workout', to='manager.Workout'),+ field=models.ForeignKey(verbose_name='Workout', to='manager.Workout', on_delete=models.CASCADE),preserve_default=True,),]diff --git a/wger/manager/migrations/0005_auto_20160303_2008.py b/wger/manager/migrations/0005_auto_20160303_2008.pyindex 588548bbe..53a16bd71 100644--- a/wger/manager/migrations/0005_auto_20160303_2008.py+++ b/wger/manager/migrations/0005_auto_20160303_2008.py@@ -16,12 +16,12 @@ class Migration(migrations.Migration):migrations.AddField(model_name='setting',name='unit',- field=models.ForeignKey(verbose_name='Unit', default=1, to='core.RepetitionUnit'),+ field=models.ForeignKey(verbose_name='Unit', default=1, to='core.RepetitionUnit', on_delete=models.CASCADE),),migrations.AddField(model_name='workoutlog',name='unit',- field=models.ForeignKey(verbose_name='Unit', default=1, to='core.RepetitionUnit'),+ field=models.ForeignKey(verbose_name='Unit', default=1, to='core.RepetitionUnit', on_delete=models.CASCADE),),migrations.AlterField(model_name='day',diff --git a/wger/manager/migrations/0006_auto_20160303_2138.py b/wger/manager/migrations/0006_auto_20160303_2138.pyindex 1f9277a2c..cc9c2be95 100644--- a/wger/manager/migrations/0006_auto_20160303_2138.py+++ b/wger/manager/migrations/0006_auto_20160303_2138.py@@ -25,11 +25,11 @@ class Migration(migrations.Migration):migrations.AddField(model_name='setting',name='weight_unit',- field=models.ForeignKey(verbose_name='Unit', to='core.WeightUnit', default=1),+ field=models.ForeignKey(verbose_name='Unit', to='core.WeightUnit', default=1, on_delete=models.CASCADE),),migrations.AddField(model_name='workoutlog',name='weight_unit',- field=models.ForeignKey(verbose_name='Unit', to='core.WeightUnit', default=1),+ field=models.ForeignKey(verbose_name='Unit', to='core.WeightUnit', default=1, on_delete=models.CASCADE),),]diff --git a/wger/manager/models.py b/wger/manager/models.pyindex 8942690f8..45019c33a 100644--- a/wger/manager/models.py+++ b/wger/manager/models.py@@ -77,7 +77,7 @@ class Workout(models.Model):blank=True,help_text=_("A short description or goal of the workout. For ""example 'Focus on back' or 'Week 1 of program xy'."))- user = models.ForeignKey(User, verbose_name=_('User'))+ user = models.ForeignKey(User, verbose_name=_('User'), on_delete=models.CASCADE)def get_absolute_url(self):'''@@ -221,7 +221,8 @@ class Schedule(models.Model):user = models.ForeignKey(User,verbose_name=_('User'),- editable=False)+ editable=False,+ on_delete=models.CASCADE)'''The user this schedule belongs to. This could be accessed through a stepthat points to a workout, that points to a user, but this is more straight@@ -328,10 +329,11 @@ class ScheduleStep(models.Model):ordering = ["order", ]schedule = models.ForeignKey(Schedule,- verbose_name=_('schedule'))+ verbose_name=_('schedule'),+ on_delete=models.CASCADE)'''The schedule is step belongs to'''- workout = models.ForeignKey(Workout)+ workout = models.ForeignKey(Workout, on_delete=models.CASCADE)'''The workout this step manages'''duration = models.IntegerField(verbose_name=_('Duration'),@@ -383,7 +385,7 @@ class Day(models.Model):'''training = models.ForeignKey(Workout,- verbose_name=_('Workout'))+ verbose_name=_('Workout'), on_delete=models.CASCADE)description = models.CharField(max_length=100,verbose_name=_('Description'),help_text=_('A description of what is done on this day (e.g. '@@ -561,7 +563,8 @@ class Set(models.Model):MAX_SETS = 10exerciseday = models.ForeignKey(Day,- verbose_name=_('Exercise day'))+ verbose_name=_('Exercise day'),+ on_delete=models.CASCADE)exercises = SortedManyToManyField(Exercise,verbose_name=_('Exercises'))order = models.IntegerField(blank=True,@@ -610,12 +613,14 @@ class Setting(models.Model):Settings for an exercise (weight, reps, etc.)'''- set = models.ForeignKey(Set, verbose_name=_('Sets'))+ set = models.ForeignKey(Set, verbose_name=_('Sets'), on_delete=models.CASCADE)exercise = models.ForeignKey(Exercise,- verbose_name=_('Exercises'))+ verbose_name=_('Exercises'),+ on_delete=models.CASCADE)repetition_unit = models.ForeignKey(RepetitionUnit,verbose_name=_('Unit'),- default=1)+ default=1,+ on_delete=models.CASCADE)'''The repetition unit of a set. This can be e.g. a repetition, a minute, etc.'''@@ -639,7 +644,8 @@ class Setting(models.Model):weight_unit = models.ForeignKey(WeightUnit,verbose_name=_('Unit'),- default=1)+ default=1,+ on_delete=models.CASCADE)'''The weight unit of a set. This can be e.g. kg, lb, km/h, etc.'''@@ -695,15 +701,19 @@ class WorkoutLog(models.Model):user = models.ForeignKey(User,verbose_name=_('User'),- editable=False)+ editable=False,+ on_delete=models.CASCADE)exercise = models.ForeignKey(Exercise,- verbose_name=_('Exercise'))+ verbose_name=_('Exercise'),+ on_delete=models.CASCADE)workout = models.ForeignKey(Workout,- verbose_name=_('Workout'))+ verbose_name=_('Workout'),+ on_delete=models.CASCADE)repetition_unit = models.ForeignKey(RepetitionUnit,verbose_name=_('Unit'),- default=1)+ default=1,+ on_delete=models.CASCADE)'''The unit of the log. This can be e.g. a repetition, a minute, etc.'''@@ -724,7 +734,8 @@ class WorkoutLog(models.Model):weight_unit = models.ForeignKey(WeightUnit,verbose_name=_('Unit'),- default=1)+ default=1,+ on_delete=models.CASCADE)'''The weight unit of the log. This can be e.g. kg, lb, km/h, etc.'''@@ -801,7 +812,8 @@ class WorkoutSession(models.Model):)user = models.ForeignKey(User,- verbose_name=_('User'))+ verbose_name=_('User'),+ on_delete=models.CASCADE)'''The user the workout session belongs to@@ -809,7 +821,8 @@ class WorkoutSession(models.Model):'''workout = models.ForeignKey(Workout,- verbose_name=_('Workout'))+ verbose_name=_('Workout'),+ on_delete=models.CASCADE)'''The workout the session belongs to'''diff --git a/wger/nutrition/migrations/0001_initial.py b/wger/nutrition/migrations/0001_initial.pyindex 8800dda4f..ccbb76b55 100644--- a/wger/nutrition/migrations/0001_initial.py+++ b/wger/nutrition/migrations/0001_initial.py@@ -32,9 +32,9 @@ class Migration(migrations.Migration):('fat_saturated', models.DecimalField(decimal_places=3, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)], max_digits=6, blank=True, help_text='In g per 100g of product', null=True, verbose_name='Saturated fat content in fats')),('fibres', models.DecimalField(decimal_places=3, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)], max_digits=6, blank=True, help_text='In g per 100g of product', null=True, verbose_name='Fibres')),('sodium', models.DecimalField(decimal_places=3, validators=[django.core.validators.MinValueValidator(0), django.core.validators.MaxValueValidator(100)], max_digits=6, blank=True, help_text='In g per 100g of product', null=True, verbose_name='Sodium')),- ('language', models.ForeignKey(editable=False, to='core.Language', verbose_name='Language')),- ('license', models.ForeignKey(default=2, verbose_name='License', to='core.License')),- ('user', models.ForeignKey(blank=True, editable=False, to=settings.AUTH_USER_MODEL, null=True, verbose_name='User')),+ ('language', models.ForeignKey(editable=False, to='core.Language', verbose_name='Language', on_delete=models.CASCADE)),+ ('license', models.ForeignKey(default=2, verbose_name='License', to='core.License', on_delete=models.CASCADE)),+ ('user', models.ForeignKey(blank=True, editable=False, to=settings.AUTH_USER_MODEL, null=True, verbose_name='User', on_delete=models.CASCADE)),],options={'ordering': ['name'],@@ -47,7 +47,7 @@ class Migration(migrations.Migration):('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),('gram', models.IntegerField(verbose_name='Amount in grams')),('amount', models.DecimalField(default=1, help_text='Unit amount, e.g. "1 Cup" or "1/2 spoon"', verbose_name='Amount', max_digits=5, decimal_places=2)),- ('ingredient', models.ForeignKey(editable=False, to='nutrition.Ingredient', verbose_name='Ingredient')),+ ('ingredient', models.ForeignKey(editable=False, to='nutrition.Ingredient', verbose_name='Ingredient', on_delete=models.CASCADE)),],options={},@@ -71,9 +71,9 @@ class Migration(migrations.Migration):('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),('order', models.IntegerField(verbose_name='Order', max_length=1, editable=False, blank=True)),('amount', models.DecimalField(verbose_name='Amount', max_digits=6, decimal_places=2, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(1000)])),- ('ingredient', models.ForeignKey(verbose_name='Ingredient', to='nutrition.Ingredient')),- ('meal', models.ForeignKey(editable=False, to='nutrition.Meal', verbose_name='Nutrition plan')),- ('weight_unit', models.ForeignKey(verbose_name='Weight unit', blank=True, to='nutrition.IngredientWeightUnit', null=True)),+ ('ingredient', models.ForeignKey(verbose_name='Ingredient', to='nutrition.Ingredient', on_delete=models.CASCADE)),+ ('meal', models.ForeignKey(editable=False, to='nutrition.Meal', verbose_name='Nutrition plan', on_delete=models.CASCADE)),+ ('weight_unit', models.ForeignKey(verbose_name='Weight unit', blank=True, to='nutrition.IngredientWeightUnit', null=True, on_delete=models.CASCADE)),],options={},@@ -86,8 +86,8 @@ class Migration(migrations.Migration):('creation_date', models.DateField(auto_now_add=True, verbose_name='Creation date')),('description', models.TextField(help_text='A description of the goal of the plan, e.g. "Gain mass" or "Prepare for summer"', max_length=2000, verbose_name='Description', blank=True)),('has_goal_calories', models.BooleanField(default=False, help_text='Tick the box if you want to mark this plan as having a goal amount of calories. You can use the calculator or enter the value yourself.', verbose_name='Use daily calories')),- ('language', models.ForeignKey(editable=False, to='core.Language', verbose_name='Language')),- ('user', models.ForeignKey(editable=False, to=settings.AUTH_USER_MODEL, verbose_name='User')),+ ('language', models.ForeignKey(editable=False, to='core.Language', verbose_name='Language', on_delete=models.CASCADE)),+ ('user', models.ForeignKey(editable=False, to=settings.AUTH_USER_MODEL, verbose_name='User', on_delete=models.CASCADE)),],options={'ordering': ['-creation_date'],@@ -99,7 +99,7 @@ class Migration(migrations.Migration):fields=[('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),('name', models.CharField(max_length=200, verbose_name='Name')),- ('language', models.ForeignKey(editable=False, to='core.Language', verbose_name='Language')),+ ('language', models.ForeignKey(editable=False, to='core.Language', verbose_name='Language', on_delete=models.CASCADE)),],options={'ordering': ['name'],@@ -109,13 +109,13 @@ class Migration(migrations.Migration):migrations.AddField(model_name='meal',name='plan',- field=models.ForeignKey(editable=False, to='nutrition.NutritionPlan', verbose_name='Nutrition plan'),+ field=models.ForeignKey(editable=False, to='nutrition.NutritionPlan', verbose_name='Nutrition plan', on_delete=models.CASCADE),preserve_default=True,),migrations.AddField(model_name='ingredientweightunit',name='unit',- field=models.ForeignKey(verbose_name='Weight unit', to='nutrition.WeightUnit'),+ field=models.ForeignKey(verbose_name='Weight unit', to='nutrition.WeightUnit', on_delete=models.CASCADE),preserve_default=True,),]diff --git a/wger/nutrition/models.py b/wger/nutrition/models.pyindex b2292c0f7..db9b5bce8 100644--- a/wger/nutrition/models.py+++ b/wger/nutrition/models.py@@ -83,10 +83,12 @@ class NutritionPlan(models.Model):user = models.ForeignKey(User,verbose_name=_('User'),- editable=False)+ editable=False,+ on_delete=models.CASCADE)language = models.ForeignKey(Language,verbose_name=_('Language'),- editable=False)+ editable=False,+ on_delete=models.CASCADE)creation_date = models.DateField(_('Creation date'), auto_now_add=True)description = models.TextField(max_length=2000,blank=True,@@ -229,7 +231,8 @@ class Ingredient(AbstractSubmissionModel, AbstractLicenseModel, models.Model):language = models.ForeignKey(Language,verbose_name=_('Language'),- editable=False)+ editable=False,+ on_delete=models.CASCADE)creation_date = models.DateField(_('Date'), auto_now_add=True)update_date = models.DateField(_('Date'),@@ -455,7 +458,8 @@ class WeightUnit(models.Model):language = models.ForeignKey(Language,verbose_name=_('Language'),- editable=False)+ editable=False,+ on_delete=models.CASCADE)name = models.CharField(max_length=200,verbose_name=_('Name'),)@@ -484,8 +488,9 @@ class IngredientWeightUnit(models.Model):ingredient = models.ForeignKey(Ingredient,verbose_name=_('Ingredient'),- editable=False)- unit = models.ForeignKey(WeightUnit, verbose_name=_('Weight unit'))+ editable=False,+ on_delete=models.CASCADE)+ unit = models.ForeignKey(WeightUnit, verbose_name=_('Weight unit'), on_delete=models.CASCADE)gram = models.IntegerField(verbose_name=_('Amount in grams'))amount = models.DecimalField(decimal_places=2,@@ -522,7 +527,8 @@ class Meal(models.Model):plan = models.ForeignKey(NutritionPlan,verbose_name=_('Nutrition plan'),- editable=False)+ editable=False,+ on_delete=models.CASCADE)order = models.IntegerField(verbose_name=_('Order'),blank=True,editable=False)@@ -579,13 +585,16 @@ class MealItem(models.Model):meal = models.ForeignKey(Meal,verbose_name=_('Nutrition plan'),- editable=False)- ingredient = models.ForeignKey(Ingredient, verbose_name=_('Ingredient'))+ editable=False,+ on_delete=models.CASCADE)+ ingredient = models.ForeignKey(Ingredient,+ verbose_name=_('Ingredient'),+ on_delete=models.CASCADE)weight_unit = models.ForeignKey(IngredientWeightUnit,verbose_name=_('Weight unit'),null=True,blank=True,- )+ on_delete=models.CASCADE)order = models.IntegerField(verbose_name=_('Order'),blank=True,diff --git a/wger/utils/models.py b/wger/utils/models.pyindex c58d7b08c..5ee61da06 100644--- a/wger/utils/models.py+++ b/wger/utils/models.py@@ -37,7 +37,8 @@ class AbstractLicenseModel(models.Model):license = models.ForeignKey(License,verbose_name=_('License'),- default=2)+ default=2,+ on_delete=models.CASCADE)'''The item's license'''license_author = models.CharField(verbose_name=_('Author'),diff --git a/wger/weight/migrations/0001_initial.py b/wger/weight/migrations/0001_initial.pyindex 3688b82ab..97f262e62 100644--- a/wger/weight/migrations/0001_initial.py+++ b/wger/weight/migrations/0001_initial.py@@ -19,7 +19,7 @@ class Migration(migrations.Migration):('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),('creation_date', models.DateField(verbose_name='Date')),('weight', models.DecimalField(verbose_name='Weight', max_digits=5, decimal_places=2, validators=[django.core.validators.MinValueValidator(30), django.core.validators.MaxValueValidator(300)])),- ('user', models.ForeignKey(verbose_name='User', to=settings.AUTH_USER_MODEL)),+ ('user', models.ForeignKey(verbose_name='User', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),],options={'ordering': ['creation_date'],diff --git a/wger/weight/models.py b/wger/weight/models.pyindex 42d9f7032..b69f97c4d 100644--- a/wger/weight/models.py+++ b/wger/weight/models.py@@ -37,7 +37,8 @@ class WeightEntry(models.Model):decimal_places=2,validators=[MinValueValidator(30), MaxValueValidator(600)])user = models.ForeignKey(User,- verbose_name=_('User'))+ verbose_name=_('User'),+ on_delete=models.CASCADE)'''The user the weight entry belongs to.