Flexible routines

.gitignore

@@ -78,6 +78,7 @@ venv-wger
 /coverage.lcov
 /media/
 /static/
+/db/
 /extras/docker/open-food-facts/dump/*.tar.gz
 /extras/docker/open-food-facts/dump/off/*
 

extras/scripts/filter-fixtures.py

@@ -64,13 +64,13 @@ def filter_dump(model_list, filename):
 filter_dump(('exercises.exerciseimage',), 'exercise-images.json')
 filter_dump(
     (
-        'exercises.exercisebase',
+        'exercises.exercise',
         'exercises.variation',
     ),
     'exercise-base-data.json',
 )
 filter_dump(
-    ('exercises.exercise', 'exercises.exercisecomment', 'exercises.alias'), 'translations.json'
+    ('exercises.translation', 'exercises.exercisecomment', 'exercises.alias'), 'translations.json'
 )
 filter_dump(
     (

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "wger"
-version = "2.3.0a2"
+version = "2.3.0a3"
 dynamic = ["dependencies"]
 authors = [
     { name = "Roland Geider", email = "[email protected]" },

wger/__init__.py

@@ -11,7 +11,7 @@
 
 MIN_APP_VERSION = (1, 7, 4, 'final', 1)
 
-VERSION = (2, 3, 0, 'alpha', 3)
+VERSION = (2, 3, 0, 'alpha', 4)
 RELEASE = True
 
 

wger/core/api/serializers.py

@@ -59,6 +59,8 @@ class Meta:
             'is_trustworthy',
             'date_joined',
             'gym',
+            'weight_rounding',
+            'reps_rounding',
             'is_temporary',
             'show_comments',
             'show_english_ingredients',

wger/core/api/views.py

@@ -53,7 +53,6 @@
     MIN_APP_VERSION,
     get_version,
 )
-from wger.core.api.permissions import AllowRegisterUser
 from wger.core.api.serializers import (
     DaysOfWeekSerializer,
     LanguageSerializer,
@@ -130,7 +129,7 @@ def create(self, request, *args, **kwargs):
             serializer.save()
 
             # New email, update the user and reset the email verification flag
-            if request.user.email != data['email']:
+            if data.get('email') and request.user.email != data['email']:
                 request.user.email = data['email']
                 request.user.save()
                 request.user.userprofile.email_verified = False