Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Explicitly set fields

Roland Geider610b33fa2d0b
diff --git a/wger/config/views/languages.py b/wger/config/views/languages.py
index d8ca63796..64b5a5919 100644
--- a/wger/config/views/languages.py
+++ b/wger/config/views/languages.py
@@ -74,6 +74,7 @@ class LanguageDeleteView(WgerDeleteMixin, DeleteView):
'''
model = Language
+ fields = '__all__'
success_url = reverse_lazy('config:language:overview')
messages = ugettext_lazy('Successfully deleted')
permission_required = 'core.delete_language'
diff --git a/wger/core/views/license.py b/wger/core/views/license.py
index 80194b77b..d2d0a9502 100644
--- a/wger/core/views/license.py
+++ b/wger/core/views/license.py
@@ -86,6 +86,7 @@ class LicenseDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
model = License
+ fields = ['full_name', 'short_name', 'url']
success_url = reverse_lazy('core:license:list')
permission_required = 'core.delete_license'
diff --git a/wger/exercises/views/categories.py b/wger/exercises/views/categories.py
index 44f81af5c..3d079fade 100644
--- a/wger/exercises/views/categories.py
+++ b/wger/exercises/views/categories.py
@@ -95,6 +95,7 @@ class ExerciseCategoryDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixi
'''
model = ExerciseCategory
+ fields = ('name',)
success_url = reverse_lazy('exercise:category:list')
delete_message = ugettext_lazy('This will also delete all exercises in this category.')
messages = ugettext_lazy('Successfully deleted')
diff --git a/wger/exercises/views/equipment.py b/wger/exercises/views/equipment.py
index f9c562aba..126c506e6 100644
--- a/wger/exercises/views/equipment.py
+++ b/wger/exercises/views/equipment.py
@@ -103,6 +103,7 @@ class EquipmentDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
model = Equipment
+ fields = ('name',)
messages = ugettext_lazy('Successfully deleted')
permission_required = 'exercises.delete_equipment'
success_url = reverse_lazy('exercise:equipment:list')
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index edff3ab6d..5821a3282 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -287,6 +287,12 @@ class ExerciseDeleteView(WgerDeleteMixin, DeleteView):
'''
model = Exercise
+ fields = ('category',
+ 'description',
+ 'name',
+ 'muscles',
+ 'muscles_secondary',
+ 'equipment')
success_url = reverse_lazy('exercise:exercise:overview')
delete_message = ugettext_lazy('This will delete the exercise from all workouts.')
messages = ugettext_lazy('Successfully deleted')
diff --git a/wger/exercises/views/images.py b/wger/exercises/views/images.py
index 8fb38222d..6cf9005f0 100644
--- a/wger/exercises/views/images.py
+++ b/wger/exercises/views/images.py
@@ -102,6 +102,7 @@ class ExerciseImageDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
model = ExerciseImage
+ fields = ('image', 'is_main')
messages = ugettext_lazy('Successfully deleted')
permission_required = 'exercises.delete_exerciseimage'
diff --git a/wger/exercises/views/muscles.py b/wger/exercises/views/muscles.py
index ab1e4298c..03ccdbcef 100644
--- a/wger/exercises/views/muscles.py
+++ b/wger/exercises/views/muscles.py
@@ -106,6 +106,7 @@ class MuscleDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
model = Muscle
+ fields = ('name', 'is_front')
success_url = reverse_lazy('exercise:muscle:admin-list')
permission_required = 'exercises.delete_muscle'
messages = ugettext_lazy('Successfully deleted')
diff --git a/wger/gym/views/admin_notes.py b/wger/gym/views/admin_notes.py
index 56e951234..ff7b83bfc 100644
--- a/wger/gym/views/admin_notes.py
+++ b/wger/gym/views/admin_notes.py
@@ -171,6 +171,7 @@ class DeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
model = AdminUserNote
+ fields = ('note', )
permission_required = 'gym.delete_adminusernote'
def get_success_url(self):
diff --git a/wger/gym/views/contract_option.py b/wger/gym/views/contract_option.py
index 5a153ada1..338a5e672 100644
--- a/wger/gym/views/contract_option.py
+++ b/wger/gym/views/contract_option.py
@@ -126,6 +126,7 @@ class DeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
model = ContractOption
+ fields = ('name', 'description')
permission_required = 'gym.delete_contractoption'
form_action_urlname = 'gym:contract-option:delete'
diff --git a/wger/gym/views/contract_type.py b/wger/gym/views/contract_type.py
index b7b00f919..5a67a0627 100644
--- a/wger/gym/views/contract_type.py
+++ b/wger/gym/views/contract_type.py
@@ -126,6 +126,7 @@ class DeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
model = ContractType
+ fields = ('name', 'description')
permission_required = 'gym.delete_contracttype'
form_action_urlname = 'gym:contract_type:delete'
diff --git a/wger/gym/views/document.py b/wger/gym/views/document.py
index 975af55e5..d985c5c62 100644
--- a/wger/gym/views/document.py
+++ b/wger/gym/views/document.py
@@ -174,6 +174,7 @@ class DeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
model = UserDocument
+ fields = ('document', 'name', 'note')
permission_required = 'gym.delete_userdocument'
def get_success_url(self):
diff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.py
index 733c1bd9f..978193e38 100644
--- a/wger/gym/views/gym.py
+++ b/wger/gym/views/gym.py
@@ -433,6 +433,13 @@ class GymDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
model = Gym
+ fields = ('name',
+ 'phone',
+ 'email',
+ 'owner',
+ 'zip_code',
+ 'city',
+ 'street')
success_url = reverse_lazy('gym:gym:list')
permission_required = 'gym.delete_gym'
diff --git a/wger/manager/views/day.py b/wger/manager/views/day.py
index da2348693..04c891190 100644
--- a/wger/manager/views/day.py
+++ b/wger/manager/views/day.py
@@ -44,12 +44,12 @@ class DayView(WgerFormMixin):
'''
model = Day
- form_class = DayForm
+ fields = ('description', 'day')
def get_success_url(self):
return reverse('manager:workout:view', kwargs={'pk': self.object.training_id})
- def get_form(self, form_class):
+ def get_form(self, form_class=DayForm):
'''
Filter the days of the week that are alreeady used by other days
'''
diff --git a/wger/manager/views/log.py b/wger/manager/views/log.py
index 7c755f65f..111df6d0f 100644
--- a/wger/manager/views/log.py
+++ b/wger/manager/views/log.py
@@ -82,6 +82,12 @@ class WorkoutLogDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
model = WorkoutLog
+ fields = ('exercise',
+ 'workout',
+ 'repetition_unit',
+ 'reps',
+ 'weight',
+ 'weight_unit')
success_url = reverse_lazy('manager:workout:calendar')
title = ugettext_lazy('Delete workout log')
form_action_urlname = 'manager:log:delete'
diff --git a/wger/manager/views/schedule.py b/wger/manager/views/schedule.py
index 61b3ce0f2..902adba8f 100644
--- a/wger/manager/views/schedule.py
+++ b/wger/manager/views/schedule.py
@@ -272,6 +272,7 @@ class ScheduleDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
model = Schedule
+ fields = ('name', 'start_date', 'is_active', 'is_loop')
success_url = reverse_lazy('manager:schedule:overview')
form_action_urlname = 'manager:schedule:delete'
messages = ugettext_lazy('Successfully deleted')
diff --git a/wger/manager/views/schedule_step.py b/wger/manager/views/schedule_step.py
index 159d0b567..077b470d3 100644
--- a/wger/manager/views/schedule_step.py
+++ b/wger/manager/views/schedule_step.py
@@ -125,6 +125,7 @@ class StepDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
model = ScheduleStep
+ fields = ('workout', 'duration', 'order')
form_action_urlname = 'manager:step:delete'
messages = ugettext_lazy('Successfully deleted')
login_required = True
diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.py
index dd124e082..945a22a44 100644
--- a/wger/manager/views/workout.py
+++ b/wger/manager/views/workout.py
@@ -221,6 +221,7 @@ class WorkoutDeleteView(WgerDeleteMixin, DeleteView):
'''
model = Workout
+ fields = ('comment',)
success_url = reverse_lazy('manager:workout:overview')
messages = ugettext_lazy('Successfully deleted')
login_required = True
diff --git a/wger/manager/views/workout_session.py b/wger/manager/views/workout_session.py
index 243a8d7d4..c2bbe49b2 100644
--- a/wger/manager/views/workout_session.py
+++ b/wger/manager/views/workout_session.py
@@ -131,6 +131,7 @@ class WorkoutSessionDeleteView(WgerDeleteMixin, DeleteView):
'''
model = WorkoutSession
+ fields = ('date', 'notes', 'impression', 'time_start', 'time_end')
success_url = reverse_lazy('manager:workout:overview')
messages = ugettext_lazy('Successfully deleted')
login_required = True
diff --git a/wger/nutrition/views/ingredient.py b/wger/nutrition/views/ingredient.py
index 90b2ca455..ecc57187c 100644
--- a/wger/nutrition/views/ingredient.py
+++ b/wger/nutrition/views/ingredient.py
@@ -100,6 +100,15 @@ class IngredientDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
model = Ingredient
+ fields = ('name',
+ 'energy',
+ 'protein',
+ 'carbohydrates',
+ 'carbohydrates_sugar',
+ 'fat',
+ 'fat_saturated',
+ 'fibres',
+ 'sodium')
template_name = 'delete.html'
success_url = reverse_lazy('nutrition:ingredient:list')
messages = ugettext_lazy('Successfully deleted')
diff --git a/wger/nutrition/views/plan.py b/wger/nutrition/views/plan.py
index 24f41a703..c821eca5a 100644
--- a/wger/nutrition/views/plan.py
+++ b/wger/nutrition/views/plan.py
@@ -90,6 +90,7 @@ class PlanDeleteView(WgerDeleteMixin, DeleteView):
'''
model = NutritionPlan
+ fields = ('description', 'has_goal_calories')
success_url = reverse_lazy('nutrition:plan:overview')
form_action_urlname = 'nutrition:plan:delete'
messages = ugettext_lazy('Successfully deleted')
@@ -109,7 +110,7 @@ class PlanEditView(WgerFormMixin, UpdateView):
'''
model = NutritionPlan
- fields = '__all__'
+ fields = ('description', 'has_goal_calories')
form_action_urlname = 'nutrition:plan:edit'
def get_context_data(self, **kwargs):
diff --git a/wger/nutrition/views/unit.py b/wger/nutrition/views/unit.py
index ee491dae4..303dc5808 100644
--- a/wger/nutrition/views/unit.py
+++ b/wger/nutrition/views/unit.py
@@ -83,6 +83,7 @@ class WeightUnitDeleteView(WgerDeleteMixin, DeleteView, WgerPermissionMixin):
'''
model = WeightUnit
+ fields = ['name']
success_url = reverse_lazy('nutrition:weight_unit:list')
form_action_urlname = 'nutrition:weight_unit:delete'
permission_required = 'nutrition.delete_ingredientweightunit'
diff --git a/wger/nutrition/views/unit_ingredient.py b/wger/nutrition/views/unit_ingredient.py
index a876439d3..410b3bc90 100644
--- a/wger/nutrition/views/unit_ingredient.py
+++ b/wger/nutrition/views/unit_ingredient.py
@@ -119,6 +119,7 @@ class WeightUnitIngredientDeleteView(WgerDeleteMixin, DeleteView, WgerPermission
'''
model = IngredientWeightUnit
+ fields = ('unit', 'gram', 'amount')
title = ugettext_lazy('Delete?')
form_action_urlname = 'nutrition:unit_ingredient:delete'
permission_required = 'nutrition.add_ingredientweightunit'