Move extend_template to context preprocessor

This way, it doesn't need to be set on the individual forms. The solution with
the different templates is kind of ugly and needs to go away in the future.

wger/core/views/misc.py

@@ -182,7 +182,6 @@ def get_context_data(self, **kwargs):
         context['form_fields'] = context['form']
         context['submit_text'] = _('Send')
         context['contribute_url'] = reverse('software:contribute')
-        context['extend_template'] = 'base_empty.html' if self.request.is_ajax() else 'base.html'
         return context
 
     def get_form_class(self):

wger/core/views/user.py

@@ -285,7 +285,6 @@ def registration(request):
 
     template_data['form'] = form
     template_data['title'] = _('Register')
-    template_data['extend_template'] = 'base.html'
 
     return render(request, 'form.html', template_data)
 
@@ -576,11 +575,6 @@ def get_form(self, form_class=None):
         )
         return form
 
-    def get_context_data(self, **kwargs):
-        context = super(WgerPasswordChangeView, self).get_context_data(**kwargs)
-        context['extend_template'] = 'base.html'
-        return context
-
 
 class WgerPasswordResetView(PasswordResetView):
     template_name = 'form.html'
@@ -594,11 +588,6 @@ def get_form(self, form_class=None):
         form.helper.add_input(Submit('submit', _("Save"), css_class='btn-success btn-block'))
         return form
 
-    def get_context_data(self, **kwargs):
-        context = super(WgerPasswordResetView, self).get_context_data(**kwargs)
-        context['extend_template'] = 'base.html'
-        return context
-
 
 class WgerPasswordResetConfirmView(PasswordResetConfirmView):
     template_name = 'form.html'
@@ -609,8 +598,3 @@ def get_form(self, form_class=None):
         form.helper.form_class = 'wger-form'
         form.helper.add_input(Submit('submit', _("Save"), css_class='btn-success btn-block'))
         return form
-
-    def get_context_data(self, **kwargs):
-        context = super(WgerPasswordResetConfirmView, self).get_context_data(**kwargs)
-        context['extend_template'] = 'base.html'
-        return context

wger/gym/views/gym.py

@@ -315,7 +315,6 @@ def gym_permissions_user_edit(request, user_pk):
 
     context = {'title': member.get_full_name(),
                'form': form,
-               'extend_template': 'base_empty.html' if request.is_ajax() else 'base.html',
                'submit_text': 'Save'}
 
     return render(request, 'form.html', context)

wger/manager/views/log.py

@@ -227,7 +227,6 @@ def add(request, pk):
     context['helper'] = WorkoutLogFormHelper()
     context['session_form'] = session_form
     context['form'] = session_form
-    context['extend_template'] = 'base.html'
     context['form_action'] = request.path
 
     return render(request, 'log/add.html', context)

wger/manager/views/set.py

@@ -120,7 +120,6 @@ def create(request, day_pk):
     context['max_sets'] = Set.MAX_SETS
     context['formsets'] = formsets
     context['helper'] = WorkoutLogFormHelper()
-    context['extend_template'] = 'base_empty.html' if request.is_ajax() else 'base.html'
     return render(request, 'set/add.html', context)
 
 

wger/manager/views/workout.py

@@ -192,7 +192,6 @@ def copy_workout(request, pk):
         template_data['form'] = workout_form
         template_data['form_fields'] = [workout_form['comment']]
         template_data['submit_text'] = _('Copy')
-        template_data['extend_template'] = 'base_empty.html' if request.is_ajax() else 'base.html'
 
         return render(request, 'form.html', template_data)
 

wger/nutrition/models.py

@@ -92,7 +92,7 @@ class Meta:
                                  editable=False,
                                  on_delete=models.CASCADE)
     creation_date = models.DateField(_('Creation date'), auto_now_add=True)
-    description = models.CharField(max_length=(80),
+    description = models.CharField(max_length=80,
                                    blank=True,
                                    verbose_name=_('Description'),
                                    help_text=_('A description of the goal of the plan, e.g. '

wger/utils/context_processor.py

@@ -71,6 +71,9 @@ def processor(request):
 
         # current gym, if available
         'custom_header': get_custom_header(request),
+
+        # Template to extend in forms, kinda ugly
+        'extend_template': 'base_empty.html' if request.is_ajax() else 'base.html'
     }
 
     # Pseudo-intelligent navigation here

wger/utils/generic_views.py

@@ -165,10 +165,6 @@ def get_context_data(self, **kwargs):
         # Custom JS code on form (autocompleter, editor, etc.)
         context['custom_js'] = self.custom_js
 
-        # Template to extend. For AJAX requests we don't need the rest of the
-        # template, only the form
-        context['extend_template'] = 'base_empty.html' if self.request.is_ajax() else 'base.html'
-
         return context
 
     def dispatch(self, request, *args, **kwargs):
@@ -273,10 +269,6 @@ def get_context_data(self, **kwargs):
         # Additional delete message
         context['delete_message'] = self.delete_message_extra
 
-        # Template to extend. For AJAX requests we don't need the rest of the
-        # template, only the form
-        context['extend_template'] = 'base_empty.html' if self.request.is_ajax() else 'base.html'
-
         return context
 
     def get_form(self, form_class=None):