Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Correct logic of pre-save in core/signals.py

Daniel Topalc1b31705a1bc
diff --git a/wger/core/migrations/0010_auto_20170403_0144.py b/wger/core/migrations/0010_auto_20170403_0144.py
index c929ccc60..3aae792b0 100644
--- a/wger/core/migrations/0010_auto_20170403_0144.py
+++ b/wger/core/migrations/0010_auto_20170403_0144.py
@@ -16,7 +16,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='userprofile',
name='birthdate',
- field=models.DateField(help_text='Please use the format: mm/dd/yyyy', null=True, validators=[wger.core.models.birthdate_validator], verbose_name='Date of Birth'),
+ field=models.DateField(null=True, validators=[wger.core.models.birthdate_validator], verbose_name='Date of Birth'),
),
migrations.AlterField(
model_name='license',
diff --git a/wger/core/models.py b/wger/core/models.py
index 3bea959fe..505394577 100644
--- a/wger/core/models.py
+++ b/wger/core/models.py
@@ -223,7 +223,6 @@ by the US Department of Agriculture. It is extremely complete, with around
'''The user's age'''
birthdate = models.DateField(verbose_name=('Date of Birth'),
- help_text=_('Please use the format: mm/dd/yyyy'),
blank=False,
null=True,
validators=[birthdate_validator])
diff --git a/wger/core/signals.py b/wger/core/signals.py
index 34c0e97be..6d9b03f68 100644
--- a/wger/core/signals.py
+++ b/wger/core/signals.py
@@ -53,7 +53,7 @@ def set_user_age(sender, instance, **kwargs):
today = datetime.date.today()
birthday = instance.birthdate
instance.age = (today.year - birthday.year
- - ((today.month, today.day) < (birthday.month, birthday.year)))
+ - ((today.month, today.day) < (birthday.month, birthday.day)))
post_save.connect(create_user_profile, sender=User)
post_save.connect(create_user_cache, sender=User)
diff --git a/wger/gym/forms.py b/wger/gym/forms.py
index f012a73fb..891c20aec 100644
--- a/wger/gym/forms.py
+++ b/wger/gym/forms.py
@@ -65,8 +65,7 @@ class GymUserAddForm(GymUserPermisssionForm, UserPersonalInformationForm):
Form used when adding a user to a gym
'''
- birthdate = forms.DateField(required=False,
- help_text=_("yyyy/mm/dd"))
+ birthdate = forms.DateField(required=False)
class Meta:
model = User