Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Allow the description to be left blank in days

Roland Geiderf33b18e0a6a0
diff --git a/wger/manager/migrations/0018_flexible_routines.py b/wger/manager/migrations/0018_flexible_routines.py
index d4a33d650..1fe78e7b7 100644
--- a/wger/manager/migrations/0018_flexible_routines.py
+++ b/wger/manager/migrations/0018_flexible_routines.py
@@ -46,7 +46,14 @@ class Migration(migrations.Migration):
),
),
('name', models.CharField(max_length=20, verbose_name='Description')),
- ('description', models.CharField(max_length=1000, verbose_name='Description')),
+ (
+ 'description',
+ models.CharField(
+ max_length=1000,
+ verbose_name='Description',
+ blank=True,
+ ),
+ ),
('is_rest', models.BooleanField(default=False)),
('last_day_in_week', models.BooleanField(default=False)),
('need_logs_to_advance', models.BooleanField(default=False)),
diff --git a/wger/manager/models/abstract_config.py b/wger/manager/models/abstract_config.py
index b3a0ac229..d4c63758a 100644
--- a/wger/manager/models/abstract_config.py
+++ b/wger/manager/models/abstract_config.py
@@ -103,21 +103,11 @@ class AbstractChangeConfig(models.Model):
# Override values for replace
if self.replace:
- self.need_log_to_apply = None
+ self.need_log_to_apply = False
self.step = None
super().save(**kwargs)
- def delete(self, using=None, keep_parents=False):
- """
- There must be a config object for the first iteration
- """
-
- if self.iteration == 1:
- return
-
- return super().delete(using=using, keep_parents=keep_parents)
-
def get_owner_object(self):
"""
Config has no owner information
diff --git a/wger/manager/models/day.py b/wger/manager/models/day.py
index 4ce1cb4df..33bf4c47d 100644
--- a/wger/manager/models/day.py
+++ b/wger/manager/models/day.py
@@ -76,6 +76,7 @@ class Day(models.Model):
description = models.CharField(
max_length=1000,
verbose_name=_('Description'),
+ blank=True,
)
is_rest = models.BooleanField(