Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Cleanup models parameters

Roland Geidercef2177a0721
diff --git a/wger/core/models.py b/wger/core/models.py
index f13f4dd7b..87f730faa 100644
--- a/wger/core/models.py
+++ b/wger/core/models.py
@@ -201,15 +201,13 @@ by the US Department of Agriculture. It is extremely complete, with around
#
# User statistics
#
- age = IntegerField(max_length=2,
- verbose_name=_('Age'),
+ age = IntegerField(verbose_name=_('Age'),
blank=False,
null=True,
validators=[MinValueValidator(10), MaxValueValidator(100)])
'''The user's age'''
- height = IntegerField(max_length=2,
- verbose_name=_('Height (cm)'),
+ height = IntegerField(verbose_name=_('Height (cm)'),
blank=False,
validators=[MinValueValidator(140), MaxValueValidator(230)],
null=True)
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index d5c25a7f0..f95cd6fa0 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -171,9 +171,9 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
verbose_name=_('Name'))
muscles = models.ManyToManyField(Muscle,
- verbose_name=_('Primary muscles'),
null=True,
- blank=True)
+ blank=True,
+ verbose_name=_('Primary muscles'))
'''Main muscles trained by the exercise'''
muscles_secondary = models.ManyToManyField(Muscle,
diff --git a/wger/gym/models.py b/wger/gym/models.py
index b56eb7bb7..ff8ddfe85 100644
--- a/wger/gym/models.py
+++ b/wger/gym/models.py
@@ -60,7 +60,6 @@ class Gym(m.Model):
'''Gym owner'''
zip_code = m.IntegerField(_(u'ZIP code'),
- max_length=5,
blank=True,
null=True)
'''ZIP code'''
@@ -123,8 +122,7 @@ class GymConfig(m.Model):
weeks_inactive = m.PositiveIntegerField(verbose_name=_('Reminder inactive members'),
help_text=_('Number of weeks since the last time a '
'user logged his presence to be considered inactive'),
- default=4,
- max_length=2)
+ default=4)
'''
Reminder inactive members
'''
diff --git a/wger/manager/models.py b/wger/manager/models.py
index 69810a29c..03f714b42 100644
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@ -315,7 +315,6 @@ class ScheduleStep(models.Model):
'''The duration in weeks'''
order = models.IntegerField(verbose_name=_('Order'),
- max_length=1,
default=1)
def get_owner_object(self):
diff --git a/wger/nutrition/models.py b/wger/nutrition/models.py
index 4c39c6fa9..cbcbe2c85 100644
--- a/wger/nutrition/models.py
+++ b/wger/nutrition/models.py
@@ -502,7 +502,6 @@ class Meal(models.Model):
verbose_name=_('Nutrition plan'),
editable=False)
order = models.IntegerField(verbose_name=_('Order'),
- max_length=1,
blank=True,
editable=False)
time = Html5TimeField(null=True,
@@ -567,7 +566,6 @@ class MealItem(models.Model):
)
order = models.IntegerField(verbose_name=_('Order'),
- max_length=1,
blank=True,
editable=False)
amount = models.DecimalField(decimal_places=2,