Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add (very generous) validators for the slot entry configs
Roland Geider9ebb607df9cd
diff --git a/wger/manager/migrations/0023_change_validators.py b/wger/manager/migrations/0023_change_validators.pynew file mode 100644index 000000000..14e08a9b9--- /dev/null+++ b/wger/manager/migrations/0023_change_validators.py@@ -0,0 +1,154 @@+# Generated by Django 4.2.20 on 2025-04-05 11:41++import django.core.validators+from django.db import migrations, models+import wger.manager.validators+++class Migration(migrations.Migration):+ dependencies = [+ ('manager', '0022_alter_rir_type'),+ ]++ operations = [+ migrations.AlterField(+ model_name='maxrepetitionsconfig',+ name='value',+ field=models.DecimalField(+ decimal_places=2,+ max_digits=6,+ validators=[+ django.core.validators.MinValueValidator(0),+ django.core.validators.MaxValueValidator(3000),+ ],+ ),+ ),+ migrations.AlterField(+ model_name='maxrestconfig',+ name='value',+ field=models.PositiveIntegerField(+ validators=[+ django.core.validators.MinValueValidator(0),+ django.core.validators.MaxValueValidator(600),+ ]+ ),+ ),+ migrations.AlterField(+ model_name='maxrirconfig',+ name='value',+ field=models.DecimalField(+ decimal_places=1,+ max_digits=2,+ validators=[+ wger.manager.validators.NullMinValueValidator(0),+ wger.manager.validators.validate_rir,+ ],+ ),+ ),+ migrations.AlterField(+ model_name='maxsetsconfig',+ name='value',+ field=models.PositiveIntegerField(+ validators=[+ django.core.validators.MinValueValidator(0),+ django.core.validators.MaxValueValidator(50),+ ]+ ),+ ),+ migrations.AlterField(+ model_name='maxweightconfig',+ name='value',+ field=models.DecimalField(+ decimal_places=2,+ max_digits=6,+ validators=[+ django.core.validators.MinValueValidator(0),+ django.core.validators.MaxValueValidator(3000),+ ],+ ),+ ),+ migrations.AlterField(+ model_name='repetitionsconfig',+ name='value',+ field=models.DecimalField(+ decimal_places=2,+ max_digits=6,+ validators=[+ django.core.validators.MinValueValidator(0),+ django.core.validators.MaxValueValidator(3000),+ ],+ ),+ ),+ migrations.AlterField(+ model_name='restconfig',+ name='value',+ field=models.PositiveIntegerField(+ validators=[+ django.core.validators.MinValueValidator(0),+ django.core.validators.MaxValueValidator(1800),+ ]+ ),+ ),+ migrations.AlterField(+ model_name='rirconfig',+ name='value',+ field=models.DecimalField(+ decimal_places=1,+ max_digits=2,+ validators=[+ wger.manager.validators.NullMinValueValidator(0),+ wger.manager.validators.validate_rir,+ ],+ ),+ ),+ migrations.AlterField(+ model_name='setsconfig',+ name='value',+ field=models.PositiveIntegerField(+ validators=[+ django.core.validators.MinValueValidator(0),+ django.core.validators.MaxValueValidator(50),+ ]+ ),+ ),+ migrations.AlterField(+ model_name='weightconfig',+ name='value',+ field=models.DecimalField(+ decimal_places=2,+ max_digits=6,+ validators=[+ django.core.validators.MinValueValidator(0),+ django.core.validators.MaxValueValidator(3000),+ ],+ ),+ ),+ migrations.AlterField(+ model_name='workoutlog',+ name='rir',+ field=models.DecimalField(+ blank=True,+ decimal_places=1,+ max_digits=2,+ null=True,+ validators=[+ wger.manager.validators.NullMinValueValidator(0),+ wger.manager.validators.validate_rir,+ ],+ ),+ ),+ migrations.AlterField(+ model_name='workoutlog',+ name='rir_target',+ field=models.DecimalField(+ blank=True,+ decimal_places=1,+ max_digits=2,+ null=True,+ validators=[+ wger.manager.validators.NullMinValueValidator(0),+ wger.manager.validators.validate_rir,+ ],+ ),+ ),+ ]diff --git a/wger/manager/models/abstract_config.py b/wger/manager/models/abstract_config.pyindex f075bcdc6..3657af7b1 100644--- a/wger/manager/models/abstract_config.py+++ b/wger/manager/models/abstract_config.py@@ -15,6 +15,10 @@# along with this program. If not, see <http://www.gnu.org/licenses/>.# Django+from django.core.validators import (+ MaxValueValidator,+ MinValueValidator,+)from django.db import models# wger@@ -56,6 +60,7 @@ class AbstractChangeConfig(models.Model):value = models.DecimalField(decimal_places=2,max_digits=6,+ validators=[MinValueValidator(0), MaxValueValidator(3000)],)"""The actual increment"""diff --git a/wger/manager/models/rest_config.py b/wger/manager/models/rest_config.pyindex 9b8789439..bce37609b 100644--- a/wger/manager/models/rest_config.py+++ b/wger/manager/models/rest_config.py@@ -13,8 +13,11 @@## You should have received a copy of the GNU Affero General Public License# along with this program. If not, see <http://www.gnu.org/licenses/>.-# Django+from django.core.validators import (+ MaxValueValidator,+ MinValueValidator,+)from django.db import models# wger@@ -26,7 +29,9 @@ class RestConfig(AbstractChangeConfig):Configuration model for the rest time for a workout set"""- value = models.PositiveIntegerField()+ value = models.PositiveIntegerField(+ validators=[MinValueValidator(0), MaxValueValidator(1800)],+ )"""Rest times are always in seconds, so always positive integers"""@@ -35,5 +40,7 @@ class MaxRestConfig(AbstractChangeConfig):Configuration model for the upper limit of the rest time for a workout set"""- value = models.PositiveIntegerField()+ value = models.PositiveIntegerField(+ validators=[MinValueValidator(0), MaxValueValidator(600)],+ )"""Rest times are always in seconds, so always positive integers"""diff --git a/wger/manager/models/sets_config.py b/wger/manager/models/sets_config.pyindex 11a6ec426..de3ae431f 100644--- a/wger/manager/models/sets_config.py+++ b/wger/manager/models/sets_config.py@@ -15,6 +15,10 @@# along with this program. If not, see <http://www.gnu.org/licenses/>.# Django+from django.core.validators import (+ MaxValueValidator,+ MinValueValidator,+)from django.db import models# wger@@ -26,7 +30,7 @@ class SetsConfig(AbstractChangeConfig):Configuration model for the number of sets for a workout set"""- value = models.PositiveIntegerField()+ value = models.PositiveIntegerField(validators=[MinValueValidator(0), MaxValueValidator(50)])"""Sets are always positive integers"""@@ -35,5 +39,5 @@ class MaxSetsConfig(AbstractChangeConfig):Configuration model for the maximum number of sets for a workout set"""- value = models.PositiveIntegerField()+ value = models.PositiveIntegerField(validators=[MinValueValidator(0), MaxValueValidator(50)])"""Sets are always positive integers"""