Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Specify fields used

Roland Geiderb7a1887e2eef
diff --git a/wger/config/views/gym_config.py b/wger/config/views/gym_config.py
index 700abfa85..6cd32329c 100644
--- a/wger/config/views/gym_config.py
+++ b/wger/config/views/gym_config.py
@@ -33,6 +33,7 @@ class GymConfigUpdateView(WgerFormMixin, UpdateView):
Generic view to edit the gym config table
'''
model = GymConfig
+ fields = '__all__'
permission_required = 'config.change_gymconfig'
success_url = reverse_lazy('gym:gym:list')
diff --git a/wger/config/views/languages.py b/wger/config/views/languages.py
index 87ca7fe51..6dbb8a861 100644
--- a/wger/config/views/languages.py
+++ b/wger/config/views/languages.py
@@ -59,6 +59,7 @@ class LanguageCreateView(WgerFormMixin, CreateView):
'''
model = Language
+ fields = '__all__'
title = ugettext_lazy('Add')
form_action = reverse_lazy('config:language:add')
permission_required = 'core.add_language'
@@ -92,6 +93,7 @@ class LanguageEditView(WgerFormMixin, UpdateView):
'''
model = Language
+ fields = '__all__'
form_action_urlname = 'config:language:edit'
permission_required = 'core.change_language'
diff --git a/wger/exercises/views/categories.py b/wger/exercises/views/categories.py
index e2794f666..c60057314 100644
--- a/wger/exercises/views/categories.py
+++ b/wger/exercises/views/categories.py
@@ -46,6 +46,7 @@ class ExerciseCategoryAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
'''
model = ExerciseCategory
+ fields = '__all__'
success_url = reverse_lazy('exercise:exercise:overview')
title = ugettext_lazy('Add category')
form_action = reverse_lazy('exercise:category:add')
@@ -62,6 +63,7 @@ class ExerciseCategoryUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin)
'''
model = ExerciseCategory
+ fields = '__all__'
success_url = reverse_lazy('exercise:exercise:overview')
permission_required = 'exercises.change_exercisecategory'
diff --git a/wger/exercises/views/equipment.py b/wger/exercises/views/equipment.py
index 569a6ffa9..59b62510c 100644
--- a/wger/exercises/views/equipment.py
+++ b/wger/exercises/views/equipment.py
@@ -48,6 +48,7 @@ class EquipmentListView(WgerPermissionMixin, ListView):
'''
model = Equipment
+ fields = '__all__'
template_name = 'equipment/list.html'
context_object_name = 'equipment_list'
paginate_by = PAGINATION_OBJECTS_PER_PAGE
@@ -60,6 +61,7 @@ class EquipmentEditView(WgerFormMixin, UpdateView, WgerPermissionMixin):
'''
model = Equipment
+ fields = '__all__'
permission_required = 'exercises.change_equipment'
success_url = reverse_lazy('exercise:equipment:list')
diff --git a/wger/exercises/views/muscles.py b/wger/exercises/views/muscles.py
index a635c2f8a..bcf108c8d 100644
--- a/wger/exercises/views/muscles.py
+++ b/wger/exercises/views/muscles.py
@@ -61,6 +61,7 @@ class MuscleAddView(WgerFormMixin, CreateView, WgerPermissionMixin):
'''
model = Muscle
+ fields = '__all__'
success_url = reverse_lazy('exercise:muscle:overview')
title = ugettext_lazy('Add muscle')
form_action = reverse_lazy('exercise:muscle:add')
@@ -73,6 +74,7 @@ class MuscleUpdateView(WgerFormMixin, UpdateView, WgerPermissionMixin):
'''
model = Muscle
+ fields = '__all__'
success_url = reverse_lazy('exercise:muscle:overview')
permission_required = 'exercises.change_muscle'
diff --git a/wger/gym/views/admin_config.py b/wger/gym/views/admin_config.py
index e4f8a15b2..a9010bc16 100644
--- a/wger/gym/views/admin_config.py
+++ b/wger/gym/views/admin_config.py
@@ -33,6 +33,7 @@ class ConfigUpdateView(WgerFormMixin, UpdateView):
'''
model = GymAdminConfig
+ fields = '__all__'
permission_required = 'gym.change_gymadminconfig'
def get_success_url(self):
diff --git a/wger/gym/views/admin_notes.py b/wger/gym/views/admin_notes.py
index 3c245e6dd..3aa201bab 100644
--- a/wger/gym/views/admin_notes.py
+++ b/wger/gym/views/admin_notes.py
@@ -79,6 +79,7 @@ class AddView(WgerFormMixin, CreateView):
'''
model = AdminUserNote
+ fields = '__all__'
title = ugettext_lazy('Add note')
permission_required = 'gym.add_adminusernote'
member = None
@@ -127,6 +128,7 @@ class UpdateView(WgerFormMixin, UpdateView):
'''
model = AdminUserNote
+ fields = '__all__'
permission_required = 'gym.change_adminusernote'
def get_success_url(self):
diff --git a/wger/gym/views/config.py b/wger/gym/views/config.py
index 0dfa6d41c..546b9603a 100644
--- a/wger/gym/views/config.py
+++ b/wger/gym/views/config.py
@@ -33,6 +33,7 @@ class GymConfigUpdateView(WgerFormMixin, UpdateView):
'''
model = GymConfig
+ fields = '__all__'
permission_required = 'gym.change_gymconfig'
def dispatch(self, request, *args, **kwargs):
diff --git a/wger/gym/views/document.py b/wger/gym/views/document.py
index 8674be5e6..fe94643eb 100644
--- a/wger/gym/views/document.py
+++ b/wger/gym/views/document.py
@@ -79,6 +79,7 @@ class AddView(WgerFormMixin, CreateView):
'''
model = UserDocument
+ fields = '__all__'
title = ugettext_lazy('Add note')
permission_required = 'gym.add_userdocument'
member = None
@@ -129,6 +130,7 @@ class UpdateView(WgerFormMixin, UpdateView):
View to update an existing document
'''
+ fields = '__all__'
model = UserDocument
permission_required = 'gym.change_userdocument'
diff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.py
index 5f55424d5..2f01b3f9a 100644
--- a/wger/gym/views/gym.py
+++ b/wger/gym/views/gym.py
@@ -116,6 +116,7 @@ class GymAddView(WgerFormMixin, CreateView):
'''
model = Gym
+ fields = '__all__'
success_url = reverse_lazy('gym:gym:list')
title = ugettext_lazy('Add new gym')
form_action = reverse_lazy('gym:gym:add')
@@ -340,6 +341,7 @@ class GymUpdateView(WgerFormMixin, UpdateView):
'''
model = Gym
+ fields = '__all__'
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.py
index 52621a130..f38ea0026 100644
--- a/wger/gym/views/user_config.py
+++ b/wger/gym/views/user_config.py
@@ -33,6 +33,7 @@ class ConfigUpdateView(WgerFormMixin, UpdateView):
'''
model = GymUserConfig
+ fields = '__all__'
permission_required = 'gym.change_gymuserconfig'
def dispatch(self, request, *args, **kwargs):
diff --git a/wger/manager/views/schedule.py b/wger/manager/views/schedule.py
index 3b4c82644..568a621f2 100644
--- a/wger/manager/views/schedule.py
+++ b/wger/manager/views/schedule.py
@@ -171,6 +171,7 @@ class ScheduleCreateView(WgerFormMixin, CreateView, WgerPermissionMixin):
'''
model = Schedule
+ fields = '__all__'
success_url = reverse_lazy('manager:schedule:overview')
title = ugettext_lazy('Create schedule')
form_action = reverse_lazy('manager:schedule:add')
@@ -211,6 +212,7 @@ class ScheduleEditView(WgerFormMixin, UpdateView, WgerPermissionMixin):
'''
model = Schedule
+ fields = '__all__'
form_action_urlname = 'manager:schedule:edit'
login_required = True
diff --git a/wger/manager/views/schedule_step.py b/wger/manager/views/schedule_step.py
index cebeedf92..4cd5f1ff6 100644
--- a/wger/manager/views/schedule_step.py
+++ b/wger/manager/views/schedule_step.py
@@ -45,6 +45,7 @@ class StepCreateView(WgerFormMixin, CreateView, WgerPermissionMixin):
'''
model = ScheduleStep
+ fields = '__all__'
title = ugettext_lazy('Add workout')
login_required = True
diff --git a/wger/nutrition/forms.py b/wger/nutrition/forms.py
index f7b045661..7f5c6fdfe 100644
--- a/wger/nutrition/forms.py
+++ b/wger/nutrition/forms.py
@@ -121,7 +121,7 @@ class MealItemForm(forms.ModelForm):
class Meta:
model = MealItem
- exclude = []
+ fields = '__all__'
def __init__(self, *args, **kwargs):
super(MealItemForm, self).__init__(*args, **kwargs)
diff --git a/wger/nutrition/views/ingredient.py b/wger/nutrition/views/ingredient.py
index cd52a1d62..edff43a63 100644
--- a/wger/nutrition/views/ingredient.py
+++ b/wger/nutrition/views/ingredient.py
@@ -121,17 +121,18 @@ class IngredientMixin(WgerFormMixin):
'''
Manually set the order of the fields
'''
- form_fields = ['name',
- 'energy',
- 'protein',
- 'carbohydrates',
- 'carbohydrates_sugar',
- 'fat',
- 'fat_saturated',
- 'fibres',
- 'sodium',
- 'license',
- 'license_author']
+
+ fields = ['name',
+ 'energy',
+ 'protein',
+ 'carbohydrates',
+ 'carbohydrates_sugar',
+ 'fat',
+ 'fat_saturated',
+ 'fibres',
+ 'sodium',
+ 'license',
+ 'license_author']
class IngredientEditView(IngredientMixin, UpdateView, WgerPermissionMixin):
diff --git a/wger/nutrition/views/meal.py b/wger/nutrition/views/meal.py
index 80818ef97..d9ce35b61 100644
--- a/wger/nutrition/views/meal.py
+++ b/wger/nutrition/views/meal.py
@@ -43,6 +43,7 @@ class MealCreateView(WgerFormMixin, CreateView):
'''
model = Meal
+ fields = '__all__'
title = ugettext_lazy('Add new meal')
owner_object = {'pk': 'plan_pk', 'class': NutritionPlan}
@@ -70,6 +71,7 @@ class MealEditView(WgerFormMixin, UpdateView):
'''
model = Meal
+ fields = '__all__'
title = ugettext_lazy('Edit meal')
form_action_urlname = 'nutrition:meal:edit'
diff --git a/wger/nutrition/views/plan.py b/wger/nutrition/views/plan.py
index c70cb6fe5..f79cb4625 100644
--- a/wger/nutrition/views/plan.py
+++ b/wger/nutrition/views/plan.py
@@ -108,6 +108,7 @@ class PlanEditView(WgerFormMixin, UpdateView):
'''
model = NutritionPlan
+ fields = '__all__'
form_action_urlname = 'nutrition:plan:edit'
def get_context_data(self, **kwargs):