Self hosted FLOSS fitness/workout, nutrition and weight tracker
Replace __all__ with explicit field lists in serializers and forms.
Karmen Lue8aaf73456be
diff --git a/wger/config/views/gym_config.py b/wger/config/views/gym_config.pyindex 6eb999732..d737ce4a2 100644--- a/wger/config/views/gym_config.py+++ b/wger/config/views/gym_config.py@@ -35,7 +35,7 @@ class GymConfigUpdateView(WgerFormMixin, UpdateView):Generic view to edit the gym config table"""model = GymConfig- fields = '__all__'+ fields = ['default_gym']permission_required = 'config.change_gymconfig'success_url = reverse_lazy('gym:gym:list')title = ugettext_lazy('Edit')diff --git a/wger/core/api/serializers.py b/wger/core/api/serializers.pyindex 55a52365d..a95f4ab2f 100644--- a/wger/core/api/serializers.py+++ b/wger/core/api/serializers.py@@ -38,7 +38,33 @@ class UserprofileSerializer(serializers.ModelSerializer):"""class Meta:model = UserProfile- fields = '__all__'+ fields = ['user',+ 'gym',+ 'is_temporary',+ 'show_comments',+ 'show_english_ingredients',+ 'workout_reminder_active',+ 'workout_reminder',+ 'workout_duration',+ 'last_workout_notification',+ 'notification_language',+ 'timer_active',+ 'timer_active',+ 'age',+ 'birthdate',+ 'height',+ 'gender',+ 'sleep_hours',+ 'work_hours',+ 'work_intensity',+ 'sport_hours',+ 'sport_intensity',+ 'freetime_hours',+ 'freetime_intensity',+ 'calories',+ 'weight_unit',+ 'ro_access',+ 'num_days_weight_reminder']class UsernameSerializer(serializers.Serializer):@@ -64,7 +90,8 @@ class LanguageSerializer(serializers.ModelSerializer):"""class Meta:model = Language- fields = '__all__'+ fields = ['short_name',+ 'full_name']class DaysOfWeekSerializer(serializers.ModelSerializer):@@ -73,7 +100,7 @@ class DaysOfWeekSerializer(serializers.ModelSerializer):"""class Meta:model = DaysOfWeek- fields = '__all__'+ fields = ['day_of_week']class LicenseSerializer(serializers.ModelSerializer):@@ -82,7 +109,9 @@ class LicenseSerializer(serializers.ModelSerializer):"""class Meta:model = License- fields = '__all__'+ fields = ['full_name',+ 'short_name',+ 'url']class RepetitionUnitSerializer(serializers.ModelSerializer):@@ -91,7 +120,7 @@ class RepetitionUnitSerializer(serializers.ModelSerializer):"""class Meta:model = RepetitionUnit- fields = '__all__'+ fields = ['name']class WeightUnitSerializer(serializers.ModelSerializer):@@ -100,4 +129,4 @@ class WeightUnitSerializer(serializers.ModelSerializer):"""class Meta:model = WeightUnit- fields = '__all__'+ fields = ['name']diff --git a/wger/core/views/languages.py b/wger/core/views/languages.pyindex 787ce346c..d1a963035 100644--- a/wger/core/views/languages.py+++ b/wger/core/views/languages.py@@ -69,7 +69,7 @@ class LanguageCreateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMi"""model = Language- fields = '__all__'+ fields = ['short_name', 'full_name']title = ugettext_lazy('Add')permission_required = 'core.add_language'@@ -80,7 +80,7 @@ class LanguageDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequired"""model = Language- fields = '__all__'+ fields = ['short_name', 'full_name']success_url = reverse_lazy('core:language:overview')messages = ugettext_lazy('Successfully deleted')permission_required = 'core.delete_language'@@ -100,7 +100,7 @@ class LanguageEditView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixi"""model = Language- fields = '__all__'+ fields = ['short_name', 'full_name']permission_required = 'core.change_language'def get_context_data(self, **kwargs):diff --git a/wger/exercises/api/serializers.py b/wger/exercises/api/serializers.pyindex ac330d5ce..5656ae1b2 100644--- a/wger/exercises/api/serializers.py+++ b/wger/exercises/api/serializers.py@@ -34,7 +34,18 @@ class ExerciseSerializer(serializers.ModelSerializer):"""class Meta:model = Exercise- fields = '__all__'+ fields = ['objects',+ 'category',+ 'description',+ 'name',+ 'name_original',+ 'muscles',+ 'muscles_secondary',+ 'equipment',+ 'creation_date',+ 'language',+ 'uuid',+ 'variations']class EquipmentSerializer(serializers.ModelSerializer):@@ -43,7 +54,7 @@ class EquipmentSerializer(serializers.ModelSerializer):"""class Meta:model = Equipment- fields = '__all__'+ fields = ['name']class ExerciseImageSerializer(serializers.ModelSerializer):@@ -52,7 +63,10 @@ class ExerciseImageSerializer(serializers.ModelSerializer):"""class Meta:model = ExerciseImage- fields = '__all__'+ fields = ['objects',+ 'exercise',+ 'image',+ 'is_main']class ExerciseCommentSerializer(serializers.ModelSerializer):@@ -61,7 +75,8 @@ class ExerciseCommentSerializer(serializers.ModelSerializer):"""class Meta:model = ExerciseComment- fields = '__all__'+ fields = ['exercise',+ 'comment']class ExerciseInfoSerializer(serializers.ModelSerializer):@@ -75,7 +90,7 @@ class ExerciseInfoSerializer(serializers.ModelSerializer):class Meta:model = Exercisedepth = 1- fields = ("id",+ fields = ["id","name","uuid","category",@@ -89,7 +104,7 @@ class ExerciseInfoSerializer(serializers.ModelSerializer):"license_author","images","variations",- "comments")+ "comments"]class ExerciseCategorySerializer(serializers.ModelSerializer):@@ -98,7 +113,7 @@ class ExerciseCategorySerializer(serializers.ModelSerializer):"""class Meta:model = ExerciseCategory- fields = '__all__'+ fields = ['name']class MuscleSerializer(serializers.ModelSerializer):@@ -107,4 +122,8 @@ class MuscleSerializer(serializers.ModelSerializer):"""class Meta:model = Muscle- fields = ['name', 'is_front', 'image_url_main', 'image_url_secondary']+ fields = ['id',+ 'name',+ 'is_front',+ 'image_url_main',+ 'image_url_secondary']diff --git a/wger/exercises/views/categories.py b/wger/exercises/views/categories.pyindex d7062b916..4b6b1c338 100644--- a/wger/exercises/views/categories.py+++ b/wger/exercises/views/categories.py@@ -64,7 +64,7 @@ class ExerciseCategoryAddView(WgerFormMixin,"""model = ExerciseCategory- fields = '__all__'+ fields = ['name']success_url = reverse_lazy('exercise:category:list')title = ugettext_lazy('Add category')permission_required = 'exercises.add_exercisecategory'@@ -83,7 +83,7 @@ class ExerciseCategoryUpdateView(WgerFormMixin,"""model = ExerciseCategory- fields = '__all__'+ fields = ['name']success_url = reverse_lazy('exercise:category:list')permission_required = 'exercises.change_exercisecategory'diff --git a/wger/exercises/views/equipment.py b/wger/exercises/views/equipment.pyindex 2a845fe6f..a7886023b 100644--- a/wger/exercises/views/equipment.py+++ b/wger/exercises/views/equipment.py@@ -61,7 +61,7 @@ class EquipmentListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):"""model = Equipment- fields = '__all__'+ fields = ['name']template_name = 'equipment/admin-overview.html'context_object_name = 'equipment_list'paginate_by = PAGINATION_OBJECTS_PER_PAGEdiff --git a/wger/exercises/views/muscles.py b/wger/exercises/views/muscles.pyindex d16401419..b7c1cb35b 100644--- a/wger/exercises/views/muscles.py+++ b/wger/exercises/views/muscles.py@@ -81,7 +81,7 @@ class MuscleAddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin,"""model = Muscle- fields = '__all__'+ fields = ['name', 'is_front']success_url = reverse_lazy('exercise:muscle:admin-list')title = ugettext_lazy('Add muscle')permission_required = 'exercises.add_muscle'@@ -93,7 +93,7 @@ class MuscleUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixi"""model = Muscle- fields = '__all__'+ fields = ['name', 'is_front']success_url = reverse_lazy('exercise:muscle:admin-list')permission_required = 'exercises.change_muscle'diff --git a/wger/gym/views/admin_config.py b/wger/gym/views/admin_config.pyindex d034565c8..7b8558d55 100644--- a/wger/gym/views/admin_config.py+++ b/wger/gym/views/admin_config.py@@ -39,7 +39,7 @@ class ConfigUpdateView(WgerFormMixin, UpdateView):"""model = GymAdminConfig- fields = '__all__'+ fields = ['overview_inactive']permission_required = 'gym.change_gymadminconfig'title = ugettext_lazy('Configuration')diff --git a/wger/gym/views/admin_notes.py b/wger/gym/views/admin_notes.pyindex 9a651e973..a36d5bdd2 100644--- a/wger/gym/views/admin_notes.py+++ b/wger/gym/views/admin_notes.py@@ -90,7 +90,7 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create"""model = AdminUserNote- fields = '__all__'+ fields = ['user', 'member', 'timestamp_created', 'timestamp_edited', 'note']title = ugettext_lazy('Add note')permission_required = 'gym.add_adminusernote'member = None@@ -130,7 +130,7 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd"""model = AdminUserNote- fields = '__all__'+ fields = ['user', 'member', 'timestamp_created', 'timestamp_edited', 'note']permission_required = 'gym.change_adminusernote'def get_success_url(self):diff --git a/wger/gym/views/config.py b/wger/gym/views/config.pyindex ab2d2fa31..67864b34d 100644--- a/wger/gym/views/config.py+++ b/wger/gym/views/config.py@@ -41,7 +41,7 @@ class GymConfigUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredM"""model = GymConfig- fields = '__all__'+ fields = ['gym', 'weeks_inactive', 'show_name']permission_required = 'gym.change_gymconfig'def dispatch(self, request, *args, **kwargs):diff --git a/wger/gym/views/contract.py b/wger/gym/views/contract.pyindex b21fc3cdb..cc2fc855e 100644--- a/wger/gym/views/contract.py+++ b/wger/gym/views/contract.py@@ -50,7 +50,9 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create"""model = Contract- fields = '__all__'+ fields = ['user', 'member', 'timestamp_created', 'timestamp_edited', 'contract_type',+ 'options', 'amount', 'payment', 'is_active', 'date_start', 'date_end', 'email',+ 'zip_code', 'city', 'street', 'phone', 'profession', 'note']title = ugettext_lazy('Add contract')permission_required = 'gym.add_contract'member = None@@ -130,7 +132,9 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd"""model = Contract- fields = '__all__'+ fields = ['user', 'member', 'timestamp_created', 'timestamp_edited', 'contract_type',+ 'options', 'amount', 'payment', 'is_active', 'date_start', 'date_end', 'email',+ 'zip_code', 'city', 'street', 'phone', 'profession', 'note']permission_required = 'gym.change_contract'def dispatch(self, request, *args, **kwargs):diff --git a/wger/gym/views/document.py b/wger/gym/views/document.pyindex ac70f48c5..379384418 100644--- a/wger/gym/views/document.py+++ b/wger/gym/views/document.py@@ -90,7 +90,14 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create"""model = UserDocument- fields = '__all__'+ fields = ['user',+ 'member',+ 'timestamp_created',+ 'timestamp_edited',+ 'document',+ 'original_name',+ 'name',+ 'note']title = ugettext_lazy('Add note')permission_required = 'gym.add_userdocument'member = None@@ -139,8 +146,9 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, UpdView to update an existing document"""- fields = '__all__'model = UserDocument+ fields = ['user', 'member', 'timestamp_created', 'timestamp_edited', 'document',+ 'original_name', 'name', 'note']permission_required = 'gym.change_userdocument'def get_success_url(self):diff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.pyindex 16cd6e626..00c8a870a 100644--- a/wger/gym/views/gym.py+++ b/wger/gym/views/gym.py@@ -160,7 +160,7 @@ class GymAddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Cre"""model = Gym- fields = '__all__'+ fields = ['objects', 'name', 'phone', 'email', 'owner', 'zip_code', 'city', 'street']title = ugettext_lazy('Add new gym')permission_required = 'gym.add_gym'@@ -424,7 +424,7 @@ class GymUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin,"""model = Gym- fields = '__all__'+ fields = ['objects', 'name', 'phone', 'email', 'owner', 'zip_code', 'city', 'street']title = ugettext_lazy('Edit gym')permission_required = 'gym.change_gym'diff --git a/wger/gym/views/user_config.py b/wger/gym/views/user_config.pyindex 4e0259c29..e08c7bd46 100644--- a/wger/gym/views/user_config.py+++ b/wger/gym/views/user_config.py@@ -41,7 +41,7 @@ class ConfigUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixi"""model = GymUserConfig- fields = '__all__'+ fields = ['include_inactive']permission_required = 'gym.change_gymuserconfig'title = ugettext_lazy('Configuration')diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex 15a2c2f40..a72937ba9 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -60,7 +60,7 @@ class WorkoutSessionSerializer(serializers.ModelSerializer):class Meta:model = WorkoutSession- fields = '__all__'+ fields = ['user', 'workout', 'date', 'notes', 'impression', 'time_start', 'time_end']class WorkoutLogSerializer(serializers.ModelSerializer):@@ -78,7 +78,7 @@ class ScheduleStepSerializer(serializers.ModelSerializer):"""class Meta:model = ScheduleStep- fields = '__all__'+ fields = ['schedule', 'workout', 'duration']class ScheduleSerializer(serializers.ModelSerializer):@@ -97,7 +97,7 @@ class DaySerializer(serializers.ModelSerializer):class Meta:model = Day- fields = '__all__'+ fields = ['training', 'description', 'day']class SetSerializer(serializers.ModelSerializer):@@ -107,7 +107,7 @@ class SetSerializer(serializers.ModelSerializer):class Meta:model = Set- fields = '__all__'+ fields = ['exerciseday', 'exercises', 'sets', 'order']class SettingSerializer(serializers.ModelSerializer):@@ -116,7 +116,8 @@ class SettingSerializer(serializers.ModelSerializer):"""class Meta:model = Setting- fields = '__all__'+ fields = ['set', 'exercise', 'repetition_unit', 'reps',+ 'weight', 'weight_unit', 'rir', 'order', 'comment']#diff --git a/wger/manager/views/schedule.py b/wger/manager/views/schedule.pyindex c40c8ae33..153c16856 100644--- a/wger/manager/views/schedule.py+++ b/wger/manager/views/schedule.py@@ -272,7 +272,7 @@ class ScheduleCreateView(WgerFormMixin, CreateView, PermissionRequiredMixin):"""model = Schedule- fields = '__all__'+ fields = ('objects', 'user', 'name', 'start_date', 'is_active', 'is_loop')success_url = reverse_lazy('manager:schedule:overview')title = ugettext_lazy('Create schedule')@@ -310,7 +310,7 @@ class ScheduleEditView(WgerFormMixin, UpdateView, PermissionRequiredMixin):"""model = Schedule- fields = '__all__'+ fields = ('objects', 'user', 'name', 'start_date', 'is_active', 'is_loop')def get_context_data(self, **kwargs):"""diff --git a/wger/manager/views/schedule_step.py b/wger/manager/views/schedule_step.pyindex 3cb61c3c4..3129ac455 100644--- a/wger/manager/views/schedule_step.py+++ b/wger/manager/views/schedule_step.py@@ -56,7 +56,7 @@ class StepCreateView(WgerFormMixin, CreateView, PermissionRequiredMixin):"""model = ScheduleStep- fields = '__all__'+ fields = ('schedule', 'workout', 'duration', 'order')title = ugettext_lazy('Add workout')def get_form_class(self):diff --git a/wger/nutrition/api/serializers.py b/wger/nutrition/api/serializers.pyindex 261434b27..ff7a7ae37 100644--- a/wger/nutrition/api/serializers.py+++ b/wger/nutrition/api/serializers.py@@ -36,7 +36,11 @@ class IngredientWeightUnitSerializer(serializers.ModelSerializer):class Meta:model = IngredientWeightUnit- fields = '__all__'+ fields = ['id',+ 'amount',+ 'gram',+ 'ingredient',+ 'unit']class IngredientWeightUnitInfoSerializer(serializers.ModelSerializer):@@ -59,7 +63,8 @@ class WeightUnitSerializer(serializers.ModelSerializer):class Meta:model = WeightUnit- fields = '__all__'+ fields = ['language',+ 'name']class IngredientSerializer(serializers.ModelSerializer):@@ -121,7 +126,12 @@ class MealItemSerializer(serializers.ModelSerializer):class Meta:model = MealItem- fields = '__all__'+ fields = ['id',+ 'meal',+ 'ingredient',+ 'weight_unit',+ 'order',+ 'amount']class MealItemInfoSerializer(serializers.ModelSerializer):@@ -132,7 +142,8 @@ class MealItemInfoSerializer(serializers.ModelSerializer):class Meta:model = MealItemdepth = 1- fields = ['ingredient',+ fields = ['id',+ 'ingredient','weight_unit','order','amount']@@ -147,7 +158,9 @@ class MealSerializer(serializers.ModelSerializer):class Meta:model = Meal- fields = '__all__'+ fields = ['plan',+ 'order',+ 'time']class MealInfoSerializer(serializers.ModelSerializer):@@ -159,7 +172,8 @@ class MealInfoSerializer(serializers.ModelSerializer):class Meta:model = Meal- fields = ['order',+ fields = ['id',+ 'order','time','meal_items','get_nutritional_values']@@ -185,7 +199,8 @@ class NutritionPlanInfoSerializer(serializers.ModelSerializer):class Meta:model = NutritionPlandepth = 1- fields = ['language',+ fields = ['id',+ 'language','creation_date','description','get_nutritional_values',diff --git a/wger/nutrition/views/meal.py b/wger/nutrition/views/meal.pyindex 44be092a8..6c400e5b3 100644--- a/wger/nutrition/views/meal.py+++ b/wger/nutrition/views/meal.py@@ -51,7 +51,7 @@ class MealCreateView(WgerFormMixin, CreateView):"""model = Meal- fields = '__all__'+ fields = ['plan', 'order', 'time']title = ugettext_lazy('Add new meal')owner_object = {'pk': 'plan_pk', 'class': NutritionPlan}@@ -76,7 +76,7 @@ class MealEditView(WgerFormMixin, UpdateView):"""model = Meal- fields = '__all__'+ fields = ['plan', 'order', 'time']title = ugettext_lazy('Edit meal')def get_success_url(self):diff --git a/wger/weight/api/serializers.py b/wger/weight/api/serializers.pyindex 9d9aec1a2..aa13f5a34 100644--- a/wger/weight/api/serializers.py+++ b/wger/weight/api/serializers.py@@ -32,4 +32,6 @@ class WeightEntrySerializer(serializers.ModelSerializer):class Meta:model = WeightEntry- fields = '__all__'+ fields = ['date',+ 'weight',+ 'user']