Self hosted FLOSS fitness/workout, nutrition and weight tracker
Mark labels further fields as explicitly nullable
Roland Geider83005f7d487c
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex c6e35f682..46c343a26 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -370,22 +370,23 @@ class SetConfigDataSerializer(serializers.Serializer):slot_entry_id = serializers.IntegerField()exercise = serializers.IntegerField()sets = serializers.IntegerField()+ # Everything below is null wherever the slot entry has no config for itmax_sets = serializers.IntegerField(allow_null=True)- weight = DecimalOrIntegerField(max_digits=6, decimal_places=2)- max_weight = DecimalOrIntegerField(max_digits=6, decimal_places=2)+ weight = DecimalOrIntegerField(max_digits=6, decimal_places=2, allow_null=True)+ max_weight = DecimalOrIntegerField(max_digits=6, decimal_places=2, allow_null=True)weight_unit = serializers.IntegerField(allow_null=True)- weight_rounding = serializers.DecimalField(max_digits=4, decimal_places=2)- repetitions = DecimalOrIntegerField(max_digits=6, decimal_places=2)- max_repetitions = DecimalOrIntegerField(max_digits=6, decimal_places=2)+ weight_rounding = serializers.DecimalField(max_digits=4, decimal_places=2, allow_null=True)+ repetitions = DecimalOrIntegerField(max_digits=6, decimal_places=2, allow_null=True)+ max_repetitions = DecimalOrIntegerField(max_digits=6, decimal_places=2, allow_null=True)repetitions_unit = serializers.IntegerField(allow_null=True)- repetitions_rounding = serializers.DecimalField(max_digits=4, decimal_places=2)- rir = DecimalOrIntegerField(max_digits=2, decimal_places=1)- max_rir = DecimalOrIntegerField(max_digits=2, decimal_places=1)+ repetitions_rounding = serializers.DecimalField(max_digits=4, decimal_places=2, allow_null=True)+ rir = DecimalOrIntegerField(max_digits=2, decimal_places=1, allow_null=True)+ max_rir = DecimalOrIntegerField(max_digits=2, decimal_places=1, allow_null=True)# max_digits=3 (not 2 like rir): RPE = 10 - RiR, so a RiR of 0 yields RPE 10,# which needs three digits to serialize.- rpe = DecimalOrIntegerField(max_digits=3, decimal_places=1)- rest = DecimalOrIntegerField(max_digits=6, decimal_places=2)- max_rest = DecimalOrIntegerField(max_digits=6, decimal_places=2)+ rpe = DecimalOrIntegerField(max_digits=3, decimal_places=1, allow_null=True)+ rest = DecimalOrIntegerField(max_digits=6, decimal_places=2, allow_null=True)+ max_rest = DecimalOrIntegerField(max_digits=6, decimal_places=2, allow_null=True)type = serializers.CharField()text_repr = serializers.CharField()comment = serializers.CharField()diff --git a/wger/nutrition/api/serializers.py b/wger/nutrition/api/serializers.pyindex a0f71a8fb..3d786a661 100644--- a/wger/nutrition/api/serializers.py+++ b/wger/nutrition/api/serializers.py@@ -254,7 +254,9 @@ class MealItemInfoSerializer(serializers.ModelSerializer):meal = serializers.PrimaryKeyRelatedField(read_only=True)ingredient = serializers.PrimaryKeyRelatedField(read_only=True)ingredient_obj = IngredientInfoSerializer(source='ingredient', read_only=True)- weight_unit = serializers.PrimaryKeyRelatedField(read_only=True)+ # Nullable like the model's own column, which redeclaring the field here+ # would otherwise drop — weight_unit_obj below already says so.+ weight_unit = serializers.PrimaryKeyRelatedField(read_only=True, allow_null=True)weight_unit_obj = IngredientWeightUnitSerializer(source='weight_unit', read_only=True, allow_null=True)