wger-project/wger
1
0
Fork 0
mirror of https://github.com/wger-project/wger.git synced 2026-02-18 00:17:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: make fields collections immutable, remove unused import

Browse Source
This commit is contained in:
Joseph
2025-10-01 21:17:22 +02:00
parent 2ab89778b1
commit 22c34246d4
28 changed files with 114 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wger/config/apps.py
View File

@@ -23,4 +23,4 @@ class ConfigConfig(AppConfig):
verbose_name = 'Config'
def ready(self):
import wger.config.signals
import wger.config.signals # noqa: F401

2
wger/config/views/gym_config.py
View File

@@ -36,7 +36,7 @@ class GymConfigUpdateView(WgerFormMixin, UpdateView):
"""
model = GymConfig
fields = ['default_gym']
fields = ('default_gym',)
permission_required = 'config.change_gymconfig'
success_url = reverse_lazy('gym:gym:list')
title = gettext_lazy('Edit')

18
wger/core/api/serializers.py
View File

@@ -52,7 +52,7 @@ class UserprofileSerializer(serializers.ModelSerializer):
class Meta:
model = UserProfile
fields = [
fields = (
'username',
'email',
'email_verified',
@@ -84,7 +84,7 @@ class UserprofileSerializer(serializers.ModelSerializer):
'weight_unit',
'ro_access',
'num_days_weight_reminder',
]
)
class UserLoginSerializer(serializers.ModelSerializer):
@@ -98,7 +98,7 @@ class UserLoginSerializer(serializers.ModelSerializer):
class Meta:
model = User
fields = ['username', 'password', 'email']
fields = ('username', 'password', 'email')
def __init__(self, request: HttpRequest = None, instance=None, data=empty, **kwargs):
self.request = request
@@ -157,12 +157,12 @@ class LanguageSerializer(serializers.ModelSerializer):
class Meta:
model = Language
fields = [
fields = (
'id',
'short_name',
'full_name',
'full_name_en',
]
)
class LicenseSerializer(serializers.ModelSerializer):
@@ -172,12 +172,12 @@ class LicenseSerializer(serializers.ModelSerializer):
class Meta:
model = License
fields = [
fields = (
'id',
'full_name',
'short_name',
'url',
]
)
class RepetitionUnitSerializer(serializers.ModelSerializer):
@@ -187,7 +187,7 @@ class RepetitionUnitSerializer(serializers.ModelSerializer):
class Meta:
model = RepetitionUnit
fields = ['id', 'name']
fields = ('id', 'name')
class RoutineWeightUnitSerializer(serializers.ModelSerializer):
@@ -197,7 +197,7 @@ class RoutineWeightUnitSerializer(serializers.ModelSerializer):
class Meta:
model = WeightUnit
fields = ['id', 'name']
fields = ('id', 'name')
class LanguageCheckSerializer(serializers.Serializer):

4
wger/core/views/languages.py
View File

@@ -70,7 +70,7 @@ class LanguageCreateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMi
"""
model = Language
fields = ['short_name', 'full_name', 'full_name_en']
fields = ('short_name', 'full_name', 'full_name_en')
title = gettext_lazy('Add')
permission_required = 'core.add_language'
@@ -100,7 +100,7 @@ class LanguageEditView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixi
"""
model = Language
fields = ['short_name', 'full_name', 'full_name_en']
fields = ('short_name', 'full_name', 'full_name_en')
permission_required = 'core.change_language'
def get_context_data(self, **kwargs):

4
wger/core/views/license.py
View File

@@ -61,7 +61,7 @@ class LicenseAddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin,
"""
model = License
fields = ['full_name', 'short_name', 'url']
fields = ('full_name', 'short_name', 'url')
success_url = reverse_lazy('core:license:list')
title = gettext_lazy('Add')
permission_required = 'core.add_license'
@@ -73,7 +73,7 @@ class LicenseUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMix
"""
model = License
fields = ['full_name', 'short_name', 'url']
fields = ('full_name', 'short_name', 'url')
success_url = reverse_lazy('core:license:list')
permission_required = 'core.change_license'

4
wger/core/views/repetition_units.py
View File

@@ -62,7 +62,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
"""
model = RepetitionUnit
fields = ['name']
fields = ('name',)
title = gettext_lazy('Add')
success_url = reverse_lazy('core:repetition-unit:list')
permission_required = 'core.add_repetitionunit'
@@ -74,7 +74,7 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
"""
model = RepetitionUnit
fields = ['name']
fields = ('name',)
success_url = reverse_lazy('core:repetition-unit:list')
permission_required = 'core.change_repetitionunit'

4
wger/core/views/weight_units.py
View File

@@ -62,7 +62,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
"""
model = WeightUnit
fields = ['name']
fields = ('name',)
title = gettext_lazy('Add')
success_url = reverse_lazy('core:weight-unit:list')
permission_required = 'core.add_weightunit'
@@ -74,7 +74,7 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
"""
model = WeightUnit
fields = ['name']
fields = ('name',)
success_url = reverse_lazy('core:weight-unit:list')
permission_required = 'core.change_weightunit'

60
wger/exercises/api/serializers.py
View File

@@ -51,7 +51,7 @@ class ExerciseSerializer(serializers.ModelSerializer):
class Meta:
model = Exercise
fields = [
fields = (
'id',
'uuid',
'created',
@@ -62,7 +62,7 @@ class ExerciseSerializer(serializers.ModelSerializer):
'equipment',
'variations',
'license_author',
]
)
class EquipmentSerializer(serializers.ModelSerializer):
@@ -72,7 +72,7 @@ class EquipmentSerializer(serializers.ModelSerializer):
class Meta:
model = Equipment
fields = ['id', 'name']
fields = ('id', 'name')
class DeletionLogSerializer(serializers.ModelSerializer):
@@ -82,13 +82,13 @@ class DeletionLogSerializer(serializers.ModelSerializer):
class Meta:
model = DeletionLog
fields = [
fields = (
'model_type',
'uuid',
'replaced_by',
'timestamp',
'comment',
]
)
class ExerciseImageSerializer(serializers.ModelSerializer):
@@ -101,7 +101,7 @@ class ExerciseImageSerializer(serializers.ModelSerializer):
class Meta:
model = ExerciseImage
fields = [
fields = (
'id',
'uuid',
'exercise',
@@ -116,7 +116,7 @@ class ExerciseImageSerializer(serializers.ModelSerializer):
'license_author_url',
'license_derivative_source_url',
'author_history',
]
)
class ExerciseVideoSerializer(serializers.ModelSerializer):
@@ -129,7 +129,7 @@ class ExerciseVideoSerializer(serializers.ModelSerializer):
class Meta:
model = ExerciseVideo
fields = [
fields = (
'id',
'uuid',
'exercise',
@@ -149,7 +149,7 @@ class ExerciseVideoSerializer(serializers.ModelSerializer):
'license_author_url',
'license_derivative_source_url',
'author_history',
]
)
class ExerciseVideoInfoSerializer(serializers.ModelSerializer):
@@ -161,7 +161,7 @@ class ExerciseVideoInfoSerializer(serializers.ModelSerializer):
class Meta:
model = ExerciseVideo
fields = [
fields = (
'id',
'uuid',
'exercise',
@@ -180,7 +180,7 @@ class ExerciseVideoInfoSerializer(serializers.ModelSerializer):
'license_author_url',
'license_derivative_source_url',
'author_history',
]
)
class ExerciseCommentSerializer(serializers.ModelSerializer):
@@ -192,12 +192,12 @@ class ExerciseCommentSerializer(serializers.ModelSerializer):
class Meta:
model = ExerciseComment
fields = [
fields = (
'id',
'uuid',
'translation',
'comment',
]
)
class ExerciseCommentSubmissionSerializer(serializers.ModelSerializer):
@@ -207,9 +207,7 @@ class ExerciseCommentSubmissionSerializer(serializers.ModelSerializer):
class Meta:
model = ExerciseComment
fields = [
'comment',
]
fields = ('comment',)
def create(self, validated_data, **kwargs):
"""
@@ -259,12 +257,12 @@ class ExerciseAliasSerializer(serializers.ModelSerializer):
class Meta:
model = Alias
fields = [
fields = (
'id',
'uuid',
'translation',
'alias',
]
)
class ExerciseAliasSubmissionSerializer(serializers.ModelSerializer):
@@ -274,9 +272,7 @@ class ExerciseAliasSubmissionSerializer(serializers.ModelSerializer):
class Meta:
model = Alias
fields = [
'alias',
]
fields = ('alias',)
def create(self, validated_data, **kwargs):
"""
@@ -301,9 +297,7 @@ class ExerciseVariationSerializer(serializers.ModelSerializer):
class Meta:
model = Variation
fields = [
'id',
]
fields = ('id',)
class ExerciseInfoAliasSerializer(serializers.ModelSerializer):
@@ -313,11 +307,11 @@ class ExerciseInfoAliasSerializer(serializers.ModelSerializer):
class Meta:
model = Alias
fields = [
fields = (
'id',
'uuid',
'alias',
]
)
class ExerciseCategorySerializer(serializers.ModelSerializer):
@@ -327,7 +321,7 @@ class ExerciseCategorySerializer(serializers.ModelSerializer):
class Meta:
model = ExerciseCategory
fields = ['id', 'name']
fields = ('id', 'name')
class MuscleSerializer(serializers.ModelSerializer):
@@ -340,14 +334,14 @@ class MuscleSerializer(serializers.ModelSerializer):
class Meta:
model = Muscle
fields = [
fields = (
'id',
'name',
'name_en',
'is_front',
'image_url_main',
'image_url_secondary',
]
)
class ExerciseTranslationBaseInfoSerializer(serializers.ModelSerializer):
@@ -541,7 +535,7 @@ class ExerciseInfoSerializer(serializers.ModelSerializer):
class Meta:
model = Exercise
depth = 1
fields = [
fields = (
'id',
'uuid',
'created',
@@ -560,7 +554,7 @@ class ExerciseInfoSerializer(serializers.ModelSerializer):
'videos',
'author_history',
'total_authors_history',
]
)
def to_representation(self, instance):
"""
@@ -627,7 +621,7 @@ class ExerciseSubmissionSerializer(serializers.ModelSerializer):
)
class Meta:
fields = [
fields = (
'id',
'category',
'muscles',
@@ -638,7 +632,7 @@ class ExerciseSubmissionSerializer(serializers.ModelSerializer):
'license',
'license_author',
'translations',
]
)
model = Exercise
def validate(self, data):

4
wger/exercises/views/categories.py
View File

@@ -67,7 +67,7 @@ class ExerciseCategoryAddView(
"""
model = ExerciseCategory
fields = ['name']
fields = ('name',)
success_url = reverse_lazy('exercise:category:list')
title = gettext_lazy('Add category')
permission_required = 'exercises.add_exercisecategory'
@@ -88,7 +88,7 @@ class ExerciseCategoryUpdateView(
"""
model = ExerciseCategory
fields = ['name']
fields = ('name',)
success_url = reverse_lazy('exercise:category:list')
permission_required = 'exercises.change_exercisecategory'

6
wger/exercises/views/equipment.py
View File

@@ -58,7 +58,7 @@ class EquipmentListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
"""
model = Equipment
fields = ['name']
fields = ('name',)
template_name = 'equipment/admin-overview.html'
context_object_name = 'equipment_list'
paginate_by = PAGINATION_OBJECTS_PER_PAGE
@@ -71,7 +71,7 @@ class EquipmentEditView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMix
"""
model = Equipment
fields = ['name']
fields = ('name',)
permission_required = 'exercises.change_equipment'
success_url = reverse_lazy('exercise:equipment:list')
@@ -88,7 +88,7 @@ class EquipmentAddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixi
"""
model = Equipment
fields = ['name']
fields = ('name',)
title = gettext_lazy('Add new equipment')
permission_required = 'exercises.add_equipment'
success_url = reverse_lazy('exercise:equipment:list')

4
wger/exercises/views/muscles.py
View File

@@ -63,7 +63,7 @@ class MuscleAddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin,
"""
model = Muscle
fields = ['name', 'is_front', 'name_en']
fields = ('name', 'is_front', 'name_en')
success_url = reverse_lazy('exercise:muscle:admin-list')
title = gettext_lazy('Add muscle')
permission_required = 'exercises.add_muscle'
@@ -75,7 +75,7 @@ class MuscleUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixi
"""
model = Muscle
fields = ['name', 'is_front', 'name_en']
fields = ('name', 'is_front', 'name_en')
success_url = reverse_lazy('exercise:muscle:admin-list')
permission_required = 'exercises.change_muscle'

2
wger/gallery/api/serializers.py
View File

@@ -12,4 +12,4 @@ class ImageSerializer(serializers.ModelSerializer):
class Meta:
model = Image
fields = ['id', 'date', 'image', 'description', 'height', 'width']
fields = ('id', 'date', 'image', 'description', 'height', 'width')

4
wger/gallery/api/views.py
View File

@@ -44,11 +44,11 @@ class GalleryImageViewSet(viewsets.ModelViewSet):
serializer_class = ImageSerializer
is_private = True
ordering_fields = '__all__'
filterset_fields = [
filterset_fields = (
'id',
'date',
'description',
]
)
def get_queryset(self):
"""

2
wger/gym/views/admin_config.py
View File

@@ -39,7 +39,7 @@ class ConfigUpdateView(WgerFormMixin, UpdateView):
"""
model = GymAdminConfig
fields = ['overview_inactive']
fields = ('overview_inactive',)
permission_required = 'gym.change_gymadminconfig'
title = gettext_lazy('Configuration')

4
wger/gym/views/admin_notes.py
View File

@@ -91,7 +91,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
"""
model = AdminUserNote
fields = ['note']
fields = ('note',)
title = gettext_lazy('Add note')
permission_required = 'gym.add_adminusernote'
member = None
@@ -131,7 +131,7 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
"""
model = AdminUserNote
fields = ['note']
fields = ('note',)
permission_required = 'gym.change_adminusernote'
def get_success_url(self):

2
wger/gym/views/config.py
View File

@@ -41,7 +41,7 @@ class GymConfigUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredM
"""
model = GymConfig
fields = ['weeks_inactive', 'show_name']
fields = ('weeks_inactive', 'show_name')
permission_required = 'gym.change_gymconfig'
def dispatch(self, request, *args, **kwargs):

8
wger/gym/views/contract.py
View File

@@ -50,7 +50,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
"""
model = Contract
fields = [
fields = (
'contract_type',
'options',
'amount',
@@ -65,7 +65,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
'phone',
'profession',
'note',
]
)
title = gettext_lazy('Add contract')
permission_required = 'gym.add_contract'
member = None
@@ -147,7 +147,7 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
"""
model = Contract
fields = [
fields = (
'contract_type',
'options',
'amount',
@@ -162,7 +162,7 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
'phone',
'profession',
'note',
]
)
permission_required = 'gym.change_contract'
def dispatch(self, request, *args, **kwargs):

4
wger/gym/views/document.py
View File

@@ -91,7 +91,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
"""
model = UserDocument
fields = ['document', 'name', 'note']
fields = ('document', 'name', 'note')
title = gettext_lazy('Add note')
permission_required = 'gym.add_userdocument'
member = None
@@ -141,7 +141,7 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
"""
model = UserDocument
fields = ['document', 'name', 'note']
fields = ('document', 'name', 'note')
permission_required = 'gym.change_userdocument'
def get_success_url(self):

4
wger/gym/views/gym.py
View File

@@ -167,7 +167,7 @@ class GymAddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Cre
"""
model = Gym
fields = ['name', 'phone', 'email', 'owner', 'zip_code', 'city', 'street']
fields = ('name', 'phone', 'email', 'owner', 'zip_code', 'city', 'street')
title = gettext_lazy('Add new gym')
permission_required = 'gym.add_gym'
@@ -439,7 +439,7 @@ class GymUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin,
"""
model = Gym
fields = ['name', 'phone', 'email', 'owner', 'zip_code', 'city', 'street']
fields = ('name', 'phone', 'email', 'owner', 'zip_code', 'city', 'street')
title = gettext_lazy('Edit gym')
permission_required = 'gym.change_gym'

2
wger/gym/views/user_config.py
View File

@@ -41,7 +41,7 @@ class ConfigUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixi
"""
model = GymUserConfig
fields = ['include_inactive']
fields = ('include_inactive',)
permission_required = 'gym.change_gymuserconfig'
title = gettext_lazy('Configuration')

8
wger/manager/api/serializers.py
View File

@@ -408,7 +408,7 @@ class WorkoutSessionSerializer(serializers.ModelSerializer):
class Meta:
model = WorkoutSession
fields = [
fields = (
'id',
'routine',
'day',
@@ -417,7 +417,7 @@ class WorkoutSessionSerializer(serializers.ModelSerializer):
'impression',
'time_start',
'time_end',
]
)
class WorkoutLogSerializer(serializers.ModelSerializer):
@@ -427,7 +427,7 @@ class WorkoutLogSerializer(serializers.ModelSerializer):
class Meta:
model = WorkoutLog
fields = [
fields = (
'id',
'date',
'session',
@@ -446,7 +446,7 @@ class WorkoutLogSerializer(serializers.ModelSerializer):
'rir_target',
'rest',
'rest_target',
]
)
class LogDisplaySerializer(serializers.Serializer):

6
wger/measurements/api/serializers.py
View File

@@ -33,7 +33,7 @@ class UnitSerializer(serializers.ModelSerializer):
class Meta:
model = Category
fields = ['id', 'name', 'unit']
fields = ('id', 'name', 'unit')
class MeasurementSerializer(serializers.ModelSerializer):
@@ -52,10 +52,10 @@ class MeasurementSerializer(serializers.ModelSerializer):
class Meta:
model = Measurement
fields = [
fields = (
'id',
'category',
'date',
'value',
'notes',
]
)

2
wger/measurements/api/views.py
View File

@@ -46,7 +46,7 @@ class CategoryViewSet(viewsets.ModelViewSet):
serializer_class = UnitSerializer
is_private = True
ordering_fields = '__all__'
filterset_fields = ['id', 'name', 'unit']
filterset_fields = ('id', 'name', 'unit')
def get_queryset(self):
"""

50
wger/nutrition/api/serializers.py
View File

@@ -40,13 +40,13 @@ class IngredientWeightUnitSerializer(serializers.ModelSerializer):
class Meta:
model = IngredientWeightUnit
fields = [
fields = (
'id',
'amount',
'gram',
'ingredient',
'unit',
]
)
class IngredientWeightUnitInfoSerializer(serializers.ModelSerializer):
@@ -57,11 +57,11 @@ class IngredientWeightUnitInfoSerializer(serializers.ModelSerializer):
class Meta:
model = IngredientWeightUnit
depth = 1
fields = [
fields = (
'gram',
'amount',
'unit',
]
)
class WeightUnitSerializer(serializers.ModelSerializer):
@@ -71,11 +71,11 @@ class WeightUnitSerializer(serializers.ModelSerializer):
class Meta:
model = WeightUnit
fields = [
fields = (
'id',
'language',
'name',
]
)
class IngredientImageSerializer(serializers.ModelSerializer):
@@ -88,7 +88,7 @@ class IngredientImageSerializer(serializers.ModelSerializer):
class Meta:
model = Image
fields = [
fields = (
'id',
'uuid',
'ingredient_id',
@@ -105,7 +105,7 @@ class IngredientImageSerializer(serializers.ModelSerializer):
'license_author',
'license_author_url',
'license_derivative_source_url',
]
)
class IngredientSerializer(serializers.ModelSerializer):
@@ -115,7 +115,7 @@ class IngredientSerializer(serializers.ModelSerializer):
class Meta:
model = Ingredient
fields = [
fields = (
'id',
'uuid',
'remote_id',
@@ -143,7 +143,7 @@ class IngredientSerializer(serializers.ModelSerializer):
'license_author_url',
'license_derivative_source_url',
'language',
]
)
class IngredientInfoSerializer(serializers.ModelSerializer):
@@ -158,7 +158,7 @@ class IngredientInfoSerializer(serializers.ModelSerializer):
class Meta:
model = Ingredient
depth = 1
fields = [
fields = (
'id',
'uuid',
'remote_id',
@@ -187,7 +187,7 @@ class IngredientInfoSerializer(serializers.ModelSerializer):
'license_derivative_source_url',
'image',
'thumbnails',
]
)
def get_thumbnails(self, obj: Ingredient):
if not hasattr(obj, 'image'):
@@ -214,14 +214,14 @@ class MealItemSerializer(serializers.ModelSerializer):
class Meta:
model = MealItem
fields = [
fields = (
'id',
'meal',
'ingredient',
'weight_unit',
'order',
'amount',
]
)
class LogItemSerializer(serializers.ModelSerializer):
@@ -231,7 +231,7 @@ class LogItemSerializer(serializers.ModelSerializer):
class Meta:
model = LogItem
fields = [
fields = (
'id',
'plan',
'meal',
@@ -239,7 +239,7 @@ class LogItemSerializer(serializers.ModelSerializer):
'weight_unit',
'datetime',
'amount',
]
)
class MealItemInfoSerializer(serializers.ModelSerializer):
@@ -257,7 +257,7 @@ class MealItemInfoSerializer(serializers.ModelSerializer):
class Meta:
model = MealItem
depth = 1
fields = [
fields = (
'id',
'meal',
'ingredient',
@@ -267,7 +267,7 @@ class MealItemInfoSerializer(serializers.ModelSerializer):
'image',
'order',
'amount',
]
)
class MealSerializer(serializers.ModelSerializer):
@@ -282,7 +282,7 @@ class MealSerializer(serializers.ModelSerializer):
class Meta:
model = Meal
fields = ['id', 'plan', 'order', 'time', 'name']
fields = ('id', 'plan', 'order', 'time', 'name')
class NutritionalValuesSerializer(serializers.Serializer):
@@ -314,7 +314,7 @@ class MealInfoSerializer(serializers.ModelSerializer):
class Meta:
model = Meal
fields = [
fields = (
'id',
'plan',
'order',
@@ -322,7 +322,7 @@ class MealInfoSerializer(serializers.ModelSerializer):
'name',
'meal_items',
'nutritional_values',
]
)
class NutritionPlanSerializer(serializers.ModelSerializer):
@@ -334,7 +334,7 @@ class NutritionPlanSerializer(serializers.ModelSerializer):
class Meta:
model = NutritionPlan
fields = [
fields = (
'id',
'creation_date',
'start',
@@ -347,7 +347,7 @@ class NutritionPlanSerializer(serializers.ModelSerializer):
'goal_fat',
'goal_fiber',
# 'nutritional_values',
]
)
class NutritionPlanInfoSerializer(serializers.ModelSerializer):
@@ -360,7 +360,7 @@ class NutritionPlanInfoSerializer(serializers.ModelSerializer):
class Meta:
model = NutritionPlan
depth = 1
fields = [
fields = (
'id',
'creation_date',
'start',
@@ -373,4 +373,4 @@ class NutritionPlanInfoSerializer(serializers.ModelSerializer):
'goal_fat',
'goal_fiber',
'meals',
]
)

12
wger/nutrition/forms.py
View File

@@ -217,12 +217,12 @@ class MealItemForm(forms.ModelForm):
class Meta:
model = MealItem
fields = [
fields = (
'ingredient',
'english_results',
'weight_unit',
'amount',
]
)
def __init__(self, *args, **kwargs):
super(MealItemForm, self).__init__(*args, **kwargs)
@@ -270,12 +270,12 @@ class MealLogItemForm(MealItemForm):
class Meta:
model = LogItem
fields = [
fields = (
'ingredient',
'weight_unit',
'amount',
'datetime',
]
)
def __init__(self, *args, **kwargs):
super(MealLogItemForm, self).__init__(*args, **kwargs)
@@ -295,7 +295,7 @@ class MealLogItemForm(MealItemForm):
class IngredientForm(forms.ModelForm):
class Meta:
model = Ingredient
fields = [
fields = (
'name',
'brand',
'energy',
@@ -308,7 +308,7 @@ class IngredientForm(forms.ModelForm):
'sodium',
'license',
'license_author',
]
)
widgets = {'category': forms.TextInput}
def __init__(self, *args, **kwargs):

4
wger/nutrition/views/unit.py
View File

@@ -82,7 +82,7 @@ class WeightUnitCreateView(
"""
model = WeightUnit
fields = ['name']
fields = ('name',)
title = gettext_lazy('Add new weight unit')
permission_required = 'nutrition.add_ingredientweightunit'
@@ -129,7 +129,7 @@ class WeightUnitUpdateView(
"""
model = WeightUnit
fields = ['name']
fields = ('name',)
permission_required = 'nutrition.change_ingredientweightunit'
def get_success_url(self):

4
wger/nutrition/views/unit_ingredient.py
View File

@@ -87,7 +87,7 @@ class WeightUnitIngredientCreateView(
class Meta:
model = IngredientWeightUnit
fields = ['unit', 'gram', 'amount']
fields = ('unit', 'gram', 'amount')
return IngredientWeightUnitForm
@@ -119,7 +119,7 @@ class WeightUnitIngredientUpdateView(
class Meta:
model = IngredientWeightUnit
fields = ['unit', 'gram', 'amount']
fields = ('unit', 'gram', 'amount')
return IngredientWeightUnitForm

4
wger/weight/api/serializers.py
View File

@@ -33,9 +33,9 @@ class WeightEntrySerializer(serializers.ModelSerializer):
class Meta:
model = WeightEntry
fields = [
fields = (
'id',
'date',
'weight',
'user',
]
)