Self hosted FLOSS fitness/workout, nutrition and weight tracker
Remove form_fields from Mixin, better to use fields in the form Meta
Roland Geidercee36b05b7c3
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.pyindex bdcc40c76..05ae5cd6c 100644--- a/wger/exercises/views/exercises.py+++ b/wger/exercises/views/exercises.py@@ -148,16 +148,6 @@ class ExercisesEditAddView(WgerFormMixin):'''model = Exercisesidebar = 'exercise/form.html'-- form_fields = ['name',- 'category',- 'description',- 'muscles',- 'muscles_secondary',- 'equipment',- 'license',- 'license_author']-title = ugettext_lazy('Add exercise')custom_js = 'init_tinymce();'clean_html = ('description', )@@ -181,6 +171,14 @@ class ExercisesEditAddView(WgerFormMixin):class Meta:model = Exercisewidgets = {'equipment': TranslatedSelectMultiple()}+ fields = ['name',+ 'category',+ 'description',+ 'muscles',+ 'muscles_secondary',+ 'equipment',+ 'license',+ 'license_author']class Media:js = ('js/tinymce/tinymce.min.js',)diff --git a/wger/utils/generic_views.py b/wger/utils/generic_views.pyindex e02dd4948..e6901ba7e 100644--- a/wger/utils/generic_views.py+++ b/wger/utils/generic_views.py@@ -72,12 +72,6 @@ class WgerPermissionMixin(object):class WgerFormMixin(ModelFormMixin, WgerPermissionMixin):template_name = 'form.html'- form_fields = []- '''- The form fields to be displayed. If left unset, the ones from the form- will be used.- '''-custom_js = '''''Custom javascript to be executed.@@ -128,15 +122,7 @@ class WgerFormMixin(ModelFormMixin, WgerPermissionMixin):context.update(csrf(self.request))context['sidebar'] = self.sidebar-- # Custom order for form fields. The list comprehension is to avoid- # weird problems with django's template when accessing the fields with "form.fieldname"- if self.form_fields:- context['form_fields'] = [kwargs['form'][i] for i in self.form_fields]-- # Use the the order as defined in the model- else:- context['form_fields'] = kwargs['form']+ context['form_fields'] = kwargs['form']# Custom JS code on form (autocompleter, editor, etc.)context['custom_js'] = self.custom_js