Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Remove the explicit form_action

Roland1864279376d0
diff --git a/wger/config/views/gym_config.py b/wger/config/views/gym_config.py
index 8c284d09b..65e7546b1 100644
--- a/wger/config/views/gym_config.py
+++ b/wger/config/views/gym_config.py
@@ -18,11 +18,8 @@
import logging
# Django
-from django.urls import (
- reverse,
- reverse_lazy
-)
-from django.utils.translation import ugettext as _
+from django.urls import reverse_lazy
+from django.utils.translation import ugettext_lazy
from django.views.generic import UpdateView
# wger
@@ -41,15 +38,10 @@ class GymConfigUpdateView(WgerFormMixin, UpdateView):
fields = '__all__'
permission_required = 'config.change_gymconfig'
success_url = reverse_lazy('gym:gym:list')
+ title = ugettext_lazy('Edit')
def get_object(self):
'''
Return the only gym config object
'''
return GymConfig.objects.get(pk=1)
-
- def get_context_data(self, **kwargs):
- context = super(GymConfigUpdateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('config:gym_config:edit')
- context['title'] = _('Edit')
- return context
diff --git a/wger/config/views/language_config.py b/wger/config/views/language_config.py
index f1082171e..d632bec5d 100644
--- a/wger/config/views/language_config.py
+++ b/wger/config/views/language_config.py
@@ -22,11 +22,8 @@ from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin
)
-from django.urls import (
- reverse,
- reverse_lazy
-)
-from django.utils.translation import ugettext as _
+from django.urls import reverse_lazy
+from django.utils.translation import ugettext_lazy
from django.views.generic import UpdateView
# wger
@@ -47,17 +44,10 @@ class LanguageConfigUpdateView(WgerFormMixin,
model = LanguageConfig
fields = ['show']
permission_required = 'config.change_languageconfig'
+ title = ugettext_lazy('Edit')
def get_success_url(self):
'''
Return to the language page
'''
return reverse_lazy('core:language:view', kwargs={'pk': self.object.language_id})
-
- def get_context_data(self, **kwargs):
- context = super(LanguageConfigUpdateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('config:language_config:edit',
- kwargs={'pk': self.object.id})
- context['title'] = _('Edit')
-
- return context
diff --git a/wger/core/views/languages.py b/wger/core/views/languages.py
index be789ce89..ea39c4126 100644
--- a/wger/core/views/languages.py
+++ b/wger/core/views/languages.py
@@ -74,7 +74,6 @@ class LanguageCreateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMi
model = Language
fields = '__all__'
title = ugettext_lazy('Add')
- form_action = reverse_lazy('core:language:add')
permission_required = 'core.add_language'
@@ -94,10 +93,7 @@ class LanguageDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequired
Send some additional data to the template
'''
context = super(LanguageDeleteView, self).get_context_data(**kwargs)
-
context['title'] = _(u'Delete {0}?').format(self.object.full_name)
- context['form_action'] = reverse('core:language:delete', kwargs={'pk': self.object.id})
-
return context
@@ -108,7 +104,6 @@ class LanguageEditView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixi
model = Language
fields = '__all__'
- form_action_urlname = 'core:language:edit'
permission_required = 'core.change_language'
def get_context_data(self, **kwargs):
diff --git a/wger/core/views/license.py b/wger/core/views/license.py
index a987a4298..458e704b9 100644
--- a/wger/core/views/license.py
+++ b/wger/core/views/license.py
@@ -22,10 +22,7 @@ from django.contrib.auth.mixins import (
LoginRequiredMixin,
PermissionRequiredMixin
)
-from django.urls import (
- reverse,
- reverse_lazy
-)
+from django.urls import reverse_lazy
from django.utils.translation import (
ugettext as _,
ugettext_lazy
@@ -66,7 +63,6 @@ class LicenseAddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin,
fields = ['full_name', 'short_name', 'url']
success_url = reverse_lazy('core:license:list')
title = ugettext_lazy('Add')
- form_action = reverse_lazy('core:license:add')
permission_required = 'core.add_license'
@@ -85,7 +81,6 @@ class LicenseUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMix
Send some additional data to the template
'''
context = super(LicenseUpdateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('core:license:edit', kwargs={'pk': self.object.id})
context['title'] = _(u'Edit {0}').format(self.object)
return context
@@ -106,5 +101,4 @@ class LicenseDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredM
'''
context = super(LicenseDeleteView, self).get_context_data(**kwargs)
context['title'] = _(u'Delete {0}?').format(self.object)
- context['form_action'] = reverse('core:license:delete', kwargs={'pk': self.kwargs['pk']})
return context
diff --git a/wger/core/views/misc.py b/wger/core/views/misc.py
index 79ddf40a8..01d84e0f1 100644
--- a/wger/core/views/misc.py
+++ b/wger/core/views/misc.py
@@ -181,7 +181,6 @@ class FeedbackClass(FormView):
context['title'] = _('Feedback')
# TODO: change template so it iterates through form and not formfields
context['form_fields'] = context['form']
- context['form_action'] = reverse('core:feedback')
context['submit_text'] = _('Send')
context['contribute_url'] = reverse('software:contribute')
context['extend_template'] = 'base_empty.html' if self.request.is_ajax() else 'base.html'
diff --git a/wger/core/views/repetition_units.py b/wger/core/views/repetition_units.py
index b6d8f04d6..21c22bed5 100644
--- a/wger/core/views/repetition_units.py
+++ b/wger/core/views/repetition_units.py
@@ -64,7 +64,6 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
fields = ['name']
title = ugettext_lazy('Add')
success_url = reverse_lazy('core:repetition-unit:list')
- form_action = reverse_lazy('core:repetition-unit:add')
permission_required = 'core.add_repetitionunit'
@@ -76,7 +75,6 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
model = RepetitionUnit
fields = ['name']
success_url = reverse_lazy('core:repetition-unit:list')
- form_action_urlname = 'core:repetition-unit:edit'
permission_required = 'core.change_repetitionunit'
def get_context_data(self, **kwargs):
@@ -96,7 +94,6 @@ class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, D
model = RepetitionUnit
success_url = reverse_lazy('core:repetition-unit:list')
permission_required = 'core.delete_repetitionunit'
- form_action_urlname = 'core:repetition-unit:delete'
def dispatch(self, request, *args, **kwargs):
'''
diff --git a/wger/core/views/user.py b/wger/core/views/user.py
index 358bd3e59..68b7ebe81 100644
--- a/wger/core/views/user.py
+++ b/wger/core/views/user.py
@@ -119,7 +119,6 @@ def delete(request, user_pk=None):
if user_pk:
user = get_object_or_404(User, pk=user_pk)
- form_action = reverse('core:user:delete', kwargs={'user_pk': user_pk})
# Forbidden if the user has not enough rights, doesn't belong to the
# gym or is an admin as well. General admins can delete all users.
@@ -132,7 +131,6 @@ def delete(request, user_pk=None):
return HttpResponseForbidden()
else:
user = request.user
- form_action = reverse('core:user:delete')
form = PasswordConfirmationForm(user=request.user)
@@ -151,8 +149,7 @@ def delete(request, user_pk=None):
gym_pk = request.user.userprofile.gym_id
return HttpResponseRedirect(reverse('gym:gym:user-list', kwargs={'pk': gym_pk}))
context = {'form': form,
- 'user_delete': user,
- 'form_action': form_action}
+ 'user_delete': user}
return render(request, 'user/delete_account.html', context)
@@ -282,7 +279,6 @@ def registration(request):
template_data['form'] = form
template_data['title'] = _('Register')
template_data['form_fields'] = [i for i in form]
- template_data['form_action'] = reverse('core:user:registration')
template_data['submit_text'] = _('Register')
template_data['extend_template'] = 'base.html'
@@ -438,7 +434,6 @@ class UserEditView(WgerFormMixin,
Send some additional data to the template
'''
context = super(UserEditView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('core:user:edit', kwargs={'pk': self.object.id})
context['title'] = _('Edit {0}'.format(self.object))
return context
diff --git a/wger/core/views/weight_units.py b/wger/core/views/weight_units.py
index 4381aa474..79ea00085 100644
--- a/wger/core/views/weight_units.py
+++ b/wger/core/views/weight_units.py
@@ -64,7 +64,6 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
fields = ['name']
title = ugettext_lazy('Add')
success_url = reverse_lazy('core:weight-unit:list')
- form_action = reverse_lazy('core:weight-unit:add')
permission_required = 'core.add_weightunit'
@@ -76,7 +75,6 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
model = WeightUnit
fields = ['name']
success_url = reverse_lazy('core:weight-unit:list')
- form_action_urlname = 'core:weight-unit:edit'
permission_required = 'core.change_weightunit'
def get_context_data(self, **kwargs):
@@ -96,7 +94,6 @@ class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, D
model = WeightUnit
success_url = reverse_lazy('core:weight-unit:list')
permission_required = 'core.delete_weightunit'
- form_action_urlname = 'core:weight-unit:delete'
def dispatch(self, request, *args, **kwargs):
'''
diff --git a/wger/email/views/gym.py b/wger/email/views/gym.py
index 26fb984ad..7d384d4d8 100644
--- a/wger/email/views/gym.py
+++ b/wger/email/views/gym.py
@@ -102,9 +102,6 @@ class EmailListFormPreview(FormPreview):
context = super(EmailListFormPreview, self).get_context(request, form)
context['gym'] = self.gym
- context['form_action'] = reverse('email:email:add-gym',
- kwargs={'gym_pk': self.gym.pk})
-
return context
def process_preview(self, request, form, context):
diff --git a/wger/exercises/views/categories.py b/wger/exercises/views/categories.py
index 035e1a94e..149ba7f91 100644
--- a/wger/exercises/views/categories.py
+++ b/wger/exercises/views/categories.py
@@ -70,7 +70,6 @@ class ExerciseCategoryAddView(WgerFormMixin,
fields = '__all__'
success_url = reverse_lazy('exercise:category:list')
title = ugettext_lazy('Add category')
- form_action = reverse_lazy('exercise:category:add')
permission_required = 'exercises.add_exercisecategory'
def form_valid(self, form):
@@ -94,7 +93,6 @@ class ExerciseCategoryUpdateView(WgerFormMixin,
# Send some additional data to the template
def get_context_data(self, **kwargs):
context = super(ExerciseCategoryUpdateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('exercise:category:edit', kwargs={'pk': self.object.id})
context['title'] = _(u'Edit {0}').format(self.object.name)
return context
@@ -123,8 +121,5 @@ class ExerciseCategoryDeleteView(WgerDeleteMixin,
# Send some additional data to the template
def get_context_data(self, **kwargs):
context = super(ExerciseCategoryDeleteView, self).get_context_data(**kwargs)
-
context['title'] = _(u'Delete {0}?').format(self.object.name)
- context['form_action'] = reverse('exercise:category:delete', kwargs={'pk': self.object.id})
-
return context
diff --git a/wger/exercises/views/comments.py b/wger/exercises/views/comments.py
index b66d5261c..8940f51a0 100644
--- a/wger/exercises/views/comments.py
+++ b/wger/exercises/views/comments.py
@@ -65,14 +65,6 @@ class ExerciseCommentEditView(WgerFormMixin,
def get_success_url(self):
return reverse('exercise:exercise:view', kwargs={'id': self.object.exercise.id})
- # Send some additional data to the template
- def get_context_data(self, **kwargs):
- context = super(ExerciseCommentEditView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('exercise:comment:edit',
- kwargs={'pk': self.object.id})
-
- return context
-
class ExerciseCommentAddView(WgerFormMixin,
LoginRequiredMixin,
@@ -94,16 +86,6 @@ class ExerciseCommentAddView(WgerFormMixin,
def get_success_url(self):
return reverse('exercise:exercise:view', kwargs={'id': self.object.exercise.id})
- def get_context_data(self, **kwargs):
- '''
- Send some additional data to the template
- '''
- context = super(ExerciseCommentAddView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('exercise:comment:add',
- kwargs={'exercise_pk': self.kwargs['exercise_pk']})
-
- return context
-
@permission_required('exercises.delete_exercisecomment')
def delete(request, id):
diff --git a/wger/exercises/views/equipment.py b/wger/exercises/views/equipment.py
index d1337f8c6..fc9db8cef 100644
--- a/wger/exercises/views/equipment.py
+++ b/wger/exercises/views/equipment.py
@@ -82,9 +82,6 @@ class EquipmentEditView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMix
def get_context_data(self, **kwargs):
context = super(EquipmentEditView, self).get_context_data(**kwargs)
context['title'] = _('Edit {0}').format(self.object)
- context['form_action'] = reverse('exercise:equipment:edit',
- kwargs={'pk': self.object.id})
-
return context
@@ -99,15 +96,6 @@ class EquipmentAddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixi
permission_required = 'exercises.add_equipment'
success_url = reverse_lazy('exercise:equipment:list')
- def get_context_data(self, **kwargs):
- '''
- Send some additional data to the template
- '''
- context = super(EquipmentAddView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('exercise:equipment:add')
-
- return context
-
class EquipmentDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, DeleteView):
'''
@@ -117,22 +105,10 @@ class EquipmentDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequire
model = Equipment
fields = ('name',)
messages = ugettext_lazy('Successfully deleted')
+ title = ugettext_lazy('Delete equipment?')
permission_required = 'exercises.delete_equipment'
success_url = reverse_lazy('exercise:equipment:list')
- def get_context_data(self, **kwargs):
- '''
- Send some additional data to the template
- '''
- pk = self.kwargs['pk']
- context = super(EquipmentDeleteView, self).get_context_data(**kwargs)
-
- context['title'] = _('Delete equipment?')
- context['form_action'] = reverse('exercise:equipment:delete',
- kwargs={'pk': pk})
-
- return context
-
class EquipmentOverviewView(ListView):
'''
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index 523aaca30..5185f6edc 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -232,7 +232,6 @@ class ExerciseUpdateView(ExercisesEditAddView,
def get_context_data(self, **kwargs):
context = super(ExerciseUpdateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('exercise:exercise:edit', kwargs={'pk': self.object.id})
context['title'] = _(u'Edit {0}').format(self.object.name)
return context
@@ -243,8 +242,6 @@ class ExerciseAddView(ExercisesEditAddView, LoginRequiredMixin, CreateView):
Generic view to add a new exercise
'''
- form_action = reverse_lazy('exercise:exercise:add')
-
def form_valid(self, form):
'''
Set language, author and status
@@ -281,7 +278,6 @@ class ExerciseCorrectView(ExercisesEditAddView, LoginRequiredMixin, UpdateView):
def get_context_data(self, **kwargs):
context = super(ExerciseCorrectView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('exercise:exercise:correct', kwargs={'pk': self.object.id})
context['title'] = _(u'Correct {0}').format(self.object.name)
return context
@@ -334,9 +330,6 @@ class ExerciseDeleteView(WgerDeleteMixin,
'''
context = super(ExerciseDeleteView, self).get_context_data(**kwargs)
context['title'] = _(u'Delete {0}?').format(self.object.name)
- context['form_action'] = reverse('exercise:exercise:delete',
- kwargs={'pk': self.kwargs['pk']})
-
return context
diff --git a/wger/exercises/views/images.py b/wger/exercises/views/images.py
index d7bdcc6a9..a6e186dc7 100644
--- a/wger/exercises/views/images.py
+++ b/wger/exercises/views/images.py
@@ -75,9 +75,6 @@ class ExerciseImageEditView(WgerFormMixin,
def get_context_data(self, **kwargs):
context = super(ExerciseImageEditView, self).get_context_data(**kwargs)
context['enctype'] = 'multipart/form-data'
- context['form_action'] = reverse('exercise:image:edit',
- kwargs={'pk': self.object.id})
-
return context
@@ -108,9 +105,6 @@ class ExerciseImageAddView(WgerFormMixin,
'''
context = super(ExerciseImageAddView, self).get_context_data(**kwargs)
context['enctype'] = 'multipart/form-data'
- context['form_action'] = reverse('exercise:image:add',
- kwargs={'exercise_pk': self.kwargs['exercise_pk']})
-
return context
@@ -142,9 +136,6 @@ class ExerciseImageDeleteView(WgerDeleteMixin,
context = super(ExerciseImageDeleteView, self).get_context_data(**kwargs)
context['title'] = _('Delete exercise image?')
- context['form_action'] = reverse('exercise:image:delete',
- kwargs={'pk': pk, 'exercise_pk': exercise_pk})
-
return context
diff --git a/wger/exercises/views/muscles.py b/wger/exercises/views/muscles.py
index ad5f36607..9b375c4ee 100644
--- a/wger/exercises/views/muscles.py
+++ b/wger/exercises/views/muscles.py
@@ -87,7 +87,6 @@ class MuscleAddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin,
fields = '__all__'
success_url = reverse_lazy('exercise:muscle:admin-list')
title = ugettext_lazy('Add muscle')
- form_action = reverse_lazy('exercise:muscle:add')
permission_required = 'exercises.add_muscle'
@@ -106,7 +105,6 @@ class MuscleUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixi
Send some additional data to the template
'''
context = super(MuscleUpdateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('exercise:muscle:edit', kwargs={'pk': self.object.id})
context['title'] = _(u'Edit {0}').format(self.object.name)
return context
@@ -128,5 +126,4 @@ class MuscleDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMi
'''
context = super(MuscleDeleteView, self).get_context_data(**kwargs)
context['title'] = _(u'Delete {0}?').format(self.object.name)
- context['form_action'] = reverse('exercise:muscle:delete', kwargs={'pk': self.kwargs['pk']})
return context
diff --git a/wger/gym/views/admin_config.py b/wger/gym/views/admin_config.py
index 795880ba0..b60672e5f 100644
--- a/wger/gym/views/admin_config.py
+++ b/wger/gym/views/admin_config.py
@@ -19,7 +19,7 @@ import logging
# Django
from django.urls import reverse
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy
from django.views.generic import UpdateView
# wger
@@ -38,18 +38,10 @@ class ConfigUpdateView(WgerFormMixin, UpdateView):
model = GymAdminConfig
fields = '__all__'
permission_required = 'gym.change_gymadminconfig'
+ title = ugettext_lazy('Configuration')
def get_success_url(self):
'''
Return to the gym user overview
'''
return reverse('gym:gym:user-list', kwargs={'pk': self.object.gym.pk})
-
- def get_context_data(self, **kwargs):
- '''
- Send some additional data to the template
- '''
- context = super(ConfigUpdateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('gym:admin_config:edit', kwargs={'pk': self.object.id})
- context['title'] = _('Configuration')
- return context
diff --git a/wger/gym/views/admin_notes.py b/wger/gym/views/admin_notes.py
index b8bd99235..e83649ed3 100644
--- a/wger/gym/views/admin_notes.py
+++ b/wger/gym/views/admin_notes.py
@@ -80,8 +80,6 @@ class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
Send some additional data to the template
'''
context = super(ListView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('gym:admin_note:add',
- kwargs={'user_pk': self.kwargs['user_pk']})
context['member'] = self.member
return context
@@ -125,15 +123,6 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
form.instance.user = self.request.user
return super(AddView, self).form_valid(form)
- def get_context_data(self, **kwargs):
- '''
- Send some additional data to the template
- '''
- context = super(AddView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('gym:admin_note:add',
- kwargs={'user_pk': self.kwargs['user_pk']})
- return context
-
class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, UpdateView):
'''
@@ -169,7 +158,6 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
Send some additional data to the template
'''
context = super(UpdateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('gym:admin_note:edit', kwargs={'pk': self.object.id})
context['title'] = _(u'Edit {0}').format(self.object)
return context
@@ -207,5 +195,4 @@ class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, D
'''
context = super(DeleteView, self).get_context_data(**kwargs)
context['title'] = _(u'Delete {0}?').format(self.object)
- context['form_action'] = reverse('gym:admin_note:delete', kwargs={'pk': self.kwargs['pk']})
return context
diff --git a/wger/gym/views/config.py b/wger/gym/views/config.py
index 14d73862f..5a765444f 100644
--- a/wger/gym/views/config.py
+++ b/wger/gym/views/config.py
@@ -65,6 +65,5 @@ class GymConfigUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredM
Send some additional data to the template
'''
context = super(GymConfigUpdateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('gym:config:edit', kwargs={'pk': self.object.id})
context['title'] = _(u'Edit {0}').format(self.object)
return context
diff --git a/wger/gym/views/contract.py b/wger/gym/views/contract.py
index 73b8f1d22..cca289b16 100644
--- a/wger/gym/views/contract.py
+++ b/wger/gym/views/contract.py
@@ -102,15 +102,6 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
form.instance.user = self.request.user
return super(AddView, self).form_valid(form)
- def get_context_data(self, **kwargs):
- '''
- Send some additional data to the template
- '''
- context = super(AddView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('gym:contract:add',
- kwargs={'user_pk': self.kwargs['user_pk']})
- return context
-
class DetailView(LoginRequiredMixin, PermissionRequiredMixin, DetailView):
'''
@@ -142,7 +133,6 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
model = Contract
fields = '__all__'
permission_required = 'gym.change_contract'
- form_action_urlname = 'gym:contract:edit'
def dispatch(self, request, *args, **kwargs):
'''
diff --git a/wger/gym/views/contract_option.py b/wger/gym/views/contract_option.py
index b74f77e7c..2eed2c0dd 100644
--- a/wger/gym/views/contract_option.py
+++ b/wger/gym/views/contract_option.py
@@ -86,15 +86,6 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
form.instance.gym_id = self.kwargs['gym_pk']
return super(AddView, self).form_valid(form)
- def get_context_data(self, **kwargs):
- '''
- Send some additional data to the template
- '''
- context = super(AddView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('gym:contract-option:add',
- kwargs={'gym_pk': self.kwargs['gym_pk']})
- return context
-
class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, UpdateView):
'''
@@ -104,7 +95,6 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
model = ContractOption
fields = ('name', 'description')
permission_required = 'gym.change_contractoption'
- form_action_urlname = 'gym:contract-option:edit'
def dispatch(self, request, *args, **kwargs):
'''
@@ -142,7 +132,6 @@ class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, D
model = ContractOption
fields = ('name', 'description')
permission_required = 'gym.delete_contractoption'
- form_action_urlname = 'gym:contract-option:delete'
def dispatch(self, request, *args, **kwargs):
'''
diff --git a/wger/gym/views/contract_type.py b/wger/gym/views/contract_type.py
index 735ca3f94..68d7c13e4 100644
--- a/wger/gym/views/contract_type.py
+++ b/wger/gym/views/contract_type.py
@@ -86,15 +86,6 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
form.instance.gym_id = self.kwargs['gym_pk']
return super(AddView, self).form_valid(form)
- def get_context_data(self, **kwargs):
- '''
- Send some additional data to the template
- '''
- context = super(AddView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('gym:contract_type:add',
- kwargs={'gym_pk': self.kwargs['gym_pk']})
- return context
-
class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, UpdateView):
'''
@@ -104,7 +95,6 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
model = ContractType
fields = ('name', 'description')
permission_required = 'gym.change_contracttype'
- form_action_urlname = 'gym:contract_type:edit'
def dispatch(self, request, *args, **kwargs):
'''
@@ -142,7 +132,6 @@ class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, D
model = ContractType
fields = ('name', 'description')
permission_required = 'gym.delete_contracttype'
- form_action_urlname = 'gym:contract_type:delete'
def dispatch(self, request, *args, **kwargs):
'''
diff --git a/wger/gym/views/document.py b/wger/gym/views/document.py
index 6c6287c88..96b66bc77 100644
--- a/wger/gym/views/document.py
+++ b/wger/gym/views/document.py
@@ -80,8 +80,6 @@ class ListView(LoginRequiredMixin, PermissionRequiredMixin, ListView):
Send some additional data to the template
'''
context = super(ListView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('gym:document:add',
- kwargs={'user_pk': self.kwargs['user_pk']})
context['member'] = self.member
return context
@@ -133,8 +131,6 @@ class AddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Create
'''
context = super(AddView, self).get_context_data(**kwargs)
context['enctype'] = 'multipart/form-data'
- context['form_action'] = reverse('gym:document:add',
- kwargs={'user_pk': self.kwargs['user_pk']})
return context
@@ -172,7 +168,6 @@ class UpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Upd
Send some additional data to the template
'''
context = super(UpdateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('gym:document:edit', kwargs={'pk': self.object.id})
context['title'] = _(u'Edit {0}').format(self.object)
return context
@@ -210,5 +205,4 @@ class DeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin, D
'''
context = super(DeleteView, self).get_context_data(**kwargs)
context['title'] = _(u'Delete {0}?').format(self.object)
- context['form_action'] = reverse('gym:document:delete', kwargs={'pk': self.kwargs['pk']})
return context
diff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.py
index b505a6914..3423666e0 100644
--- a/wger/gym/views/gym.py
+++ b/wger/gym/views/gym.py
@@ -158,7 +158,6 @@ class GymAddView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, Cre
model = Gym
fields = '__all__'
title = ugettext_lazy('Add new gym')
- form_action = reverse_lazy('gym:gym:add')
permission_required = 'gym.add_gym'
@@ -310,7 +309,6 @@ def gym_permissions_user_edit(request, user_pk):
context = {}
context['title'] = member.get_full_name()
context['form'] = form
- context['form_action'] = reverse('gym:gym:edit-user-permission', kwargs={'user_pk': member.pk})
context['extend_template'] = 'base_empty.html' if request.is_ajax() else 'base.html'
context['submit_text'] = 'Save'
@@ -407,15 +405,6 @@ class GymAddUserView(WgerFormMixin,
return super(GymAddUserView, self).form_valid(form)
- def get_context_data(self, **kwargs):
- '''
- Send some additional data to the template
- '''
- context = super(GymAddUserView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('gym:gym:add-user',
- kwargs={'gym_pk': self.kwargs['gym_pk']})
- return context
-
class GymUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin, UpdateView):
'''
@@ -445,7 +434,6 @@ class GymUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixin,
Send some additional data to the template
'''
context = super(GymUpdateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('gym:gym:edit', kwargs={'pk': self.object.id})
context['title'] = _(u'Edit {0}').format(self.object)
return context
@@ -472,5 +460,4 @@ class GymDeleteView(WgerDeleteMixin, LoginRequiredMixin, PermissionRequiredMixin
'''
context = super(GymDeleteView, self).get_context_data(**kwargs)
context['title'] = _(u'Delete {0}?').format(self.object)
- context['form_action'] = reverse('gym:gym:delete', kwargs={'pk': self.kwargs['pk']})
return context
diff --git a/wger/gym/views/user_config.py b/wger/gym/views/user_config.py
index 09fdc7bbf..c7f86db07 100644
--- a/wger/gym/views/user_config.py
+++ b/wger/gym/views/user_config.py
@@ -24,7 +24,7 @@ from django.contrib.auth.mixins import (
)
from django.http import HttpResponseForbidden
from django.urls import reverse
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy
from django.views.generic import UpdateView
# wger
@@ -43,6 +43,7 @@ class ConfigUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixi
model = GymUserConfig
fields = '__all__'
permission_required = 'gym.change_gymuserconfig'
+ title = ugettext_lazy('Configuration')
def dispatch(self, request, *args, **kwargs):
'''
@@ -63,12 +64,3 @@ class ConfigUpdateView(WgerFormMixin, LoginRequiredMixin, PermissionRequiredMixi
Return to the gym user overview
'''
return reverse('gym:gym:user-list', kwargs={'pk': self.object.gym.pk})
-
- def get_context_data(self, **kwargs):
- '''
- Send some additional data to the template
- '''
- context = super(ConfigUpdateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('gym:user_config:edit', kwargs={'pk': self.object.id})
- context['title'] = _('Configuration')
- return context
diff --git a/wger/manager/tests/test_timer.py b/wger/manager/tests/test_timer.py
index 5ec183cbb..b84d863d6 100644
--- a/wger/manager/tests/test_timer.py
+++ b/wger/manager/tests/test_timer.py
@@ -174,11 +174,6 @@ class WorkoutTimerWorkoutSessionTestCase(WorkoutManagerTestCase):
today = datetime.date.today()
response = self.client.get(reverse('manager:workout:timer', kwargs={'day_pk': 5}))
- self.assertEqual(response.context['form_action'],
- reverse('manager:session:add', kwargs={'workout_pk': 3,
- 'year': today.year,
- 'month': today.month,
- 'day': today.day}))
session = WorkoutSession()
session.user = User.objects.get(username='test')
@@ -189,7 +184,3 @@ class WorkoutTimerWorkoutSessionTestCase(WorkoutManagerTestCase):
session.time_start = datetime.time(11, 00)
session.time_end = datetime.time(13, 00)
session.save()
-
- response = self.client.get(reverse('manager:workout:timer', kwargs={'day_pk': 5}))
- self.assertEqual(response.context['form_action'],
- reverse('manager:session:edit', kwargs={'pk': session.pk}))
diff --git a/wger/manager/views/day.py b/wger/manager/views/day.py
index 6996bb7ba..cf119bca1 100644
--- a/wger/manager/views/day.py
+++ b/wger/manager/views/day.py
@@ -94,8 +94,6 @@ class DayEditView(DayView, UpdateView):
Generic view to update an existing exercise day
'''
- form_action_urlname = 'manager:day:edit'
-
# Send some additional data to the template
def get_context_data(self, **kwargs):
context = super(DayEditView, self).get_context_data(**kwargs)
@@ -118,14 +116,6 @@ class DayCreateView(DayView, CreateView):
form.instance.training = Workout.objects.get(pk=self.kwargs['workout_pk'])
return super(DayCreateView, self).form_valid(form)
- # Send some additional data to the template
- def get_context_data(self, **kwargs):
- context = super(DayCreateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('manager:day:add',
- kwargs={'workout_pk': self.kwargs['workout_pk']})
- return context
-
-
@login_required
def delete(request, pk):
'''
diff --git a/wger/manager/views/log.py b/wger/manager/views/log.py
index 146102e1b..09a010eb1 100644
--- a/wger/manager/views/log.py
+++ b/wger/manager/views/log.py
@@ -86,9 +86,7 @@ class WorkoutLogUpdateView(WgerFormMixin, UpdateView, LoginRequiredMixin):
def get_context_data(self, **kwargs):
context = super(WorkoutLogUpdateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('manager:log:edit', kwargs={'pk': self.object.id})
context['title'] = _(u'Edit log entry for %s') % self.object.exercise.name
-
return context
@@ -106,7 +104,6 @@ class WorkoutLogDeleteView(WgerDeleteMixin, DeleteView, LoginRequiredMixin):
'weight_unit')
success_url = reverse_lazy('manager:workout:calendar')
title = ugettext_lazy('Delete workout log')
- form_action_urlname = 'manager:log:delete'
def add(request, pk):
@@ -232,7 +229,6 @@ def add(request, pk):
template_data['formset'] = formset
template_data['dateform'] = dateform
template_data['session_form'] = session_form
- template_data['form_action'] = reverse('manager:day:log', kwargs={'pk': pk})
return render(request, 'day/log.html', template_data)
diff --git a/wger/manager/views/schedule.py b/wger/manager/views/schedule.py
index ff06a3c88..81d3e2f29 100644
--- a/wger/manager/views/schedule.py
+++ b/wger/manager/views/schedule.py
@@ -275,7 +275,6 @@ class ScheduleCreateView(WgerFormMixin, CreateView, PermissionRequiredMixin):
fields = '__all__'
success_url = reverse_lazy('manager:schedule:overview')
title = ugettext_lazy('Create schedule')
- form_action = reverse_lazy('manager:schedule:add')
def form_valid(self, form):
'''set the submitter'''
@@ -294,7 +293,6 @@ class ScheduleDeleteView(WgerDeleteMixin, DeleteView, PermissionRequiredMixin):
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')
def get_context_data(self, **kwargs):
@@ -313,7 +311,6 @@ class ScheduleEditView(WgerFormMixin, UpdateView, PermissionRequiredMixin):
model = Schedule
fields = '__all__'
- form_action_urlname = 'manager:schedule:edit'
def get_context_data(self, **kwargs):
'''
diff --git a/wger/manager/views/schedule_step.py b/wger/manager/views/schedule_step.py
index 9aacb709c..ffb5ac28b 100644
--- a/wger/manager/views/schedule_step.py
+++ b/wger/manager/views/schedule_step.py
@@ -76,12 +76,6 @@ class StepCreateView(WgerFormMixin, CreateView, PermissionRequiredMixin):
return StepForm
- def get_context_data(self, **kwargs):
- context = super(StepCreateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('manager:step:add',
- kwargs={'schedule_pk': self.kwargs['schedule_pk']})
- return context
-
def get_success_url(self):
return reverse('manager:schedule:view', kwargs={'pk': self.kwargs['schedule_pk']})
@@ -103,7 +97,6 @@ class StepEditView(WgerFormMixin, UpdateView, PermissionRequiredMixin):
model = ScheduleStep
title = ugettext_lazy('Edit workout')
- form_action_urlname = 'manager:step:edit'
def get_form_class(self):
'''
@@ -133,7 +126,6 @@ class StepDeleteView(WgerDeleteMixin, DeleteView, PermissionRequiredMixin):
model = ScheduleStep
fields = ('workout', 'duration', 'order')
- form_action_urlname = 'manager:step:delete'
messages = ugettext_lazy('Successfully deleted')
def get_success_url(self):
@@ -145,5 +137,4 @@ class StepDeleteView(WgerDeleteMixin, DeleteView, PermissionRequiredMixin):
'''
context = super(StepDeleteView, self).get_context_data(**kwargs)
context['title'] = _(u'Delete {0}?').format(self.object)
- context['form_action'] = reverse('core:license:delete', kwargs={'pk': self.kwargs['pk']})
return context
diff --git a/wger/manager/views/set.py b/wger/manager/views/set.py
index b70ba0a72..b1fb29fe1 100644
--- a/wger/manager/views/set.py
+++ b/wger/manager/views/set.py
@@ -141,7 +141,6 @@ def create(request, day_pk):
context['day'] = day
context['max_sets'] = Set.MAX_SETS
context['formsets'] = formsets
- context['form_action'] = reverse('manager:set:add', kwargs={'day_pk': day_pk})
context['extend_template'] = 'base_empty.html' if request.is_ajax() else 'base.html'
return render(request, 'set/add.html', context)
@@ -239,5 +238,4 @@ def edit(request, pk):
# Other context we need
context = {}
context['formsets'] = formsets
- context['form_action'] = reverse('manager:set:edit', kwargs={'pk': pk})
return render(request, 'set/edit.html', context)
diff --git a/wger/manager/views/workout.py b/wger/manager/views/workout.py
index c9342b5e0..67586bddd 100644
--- a/wger/manager/views/workout.py
+++ b/wger/manager/views/workout.py
@@ -215,7 +215,6 @@ def copy_workout(request, pk):
template_data.update(csrf(request))
template_data['title'] = _('Copy workout')
template_data['form'] = workout_form
- template_data['form_action'] = reverse('manager:workout:copy', kwargs={'pk': workout.id})
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'
@@ -247,9 +246,7 @@ class WorkoutDeleteView(WgerDeleteMixin, LoginRequiredMixin, DeleteView):
def get_context_data(self, **kwargs):
context = super(WorkoutDeleteView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('manager:workout:delete', kwargs={'pk': self.object.id})
context['title'] = _(u'Delete {0}?').format(self.object)
-
return context
@@ -260,12 +257,10 @@ class WorkoutEditView(WgerFormMixin, LoginRequiredMixin, UpdateView):
model = Workout
form_class = WorkoutForm
- form_action_urlname = 'manager:workout:edit'
def get_context_data(self, **kwargs):
context = super(WorkoutEditView, self).get_context_data(**kwargs)
context['title'] = _(u'Edit {0}').format(self.object)
-
return context
@@ -388,14 +383,9 @@ def timer(request, day_pk):
# the current one or create a new one (this will be the most usual case)
if WorkoutSession.objects.filter(user=request.user, date=datetime.date.today()).exists():
session = WorkoutSession.objects.get(user=request.user, date=datetime.date.today())
- url = reverse('manager:session:edit', kwargs={'pk': session.pk})
session_form = WorkoutSessionHiddenFieldsForm(instance=session)
else:
today = datetime.date.today()
- url = reverse('manager:session:add', kwargs={'workout_pk': day.training_id,
- 'year': today.year,
- 'month': today.month,
- 'day': today.day})
session_form = WorkoutSessionHiddenFieldsForm()
# Render template
@@ -404,7 +394,6 @@ def timer(request, day_pk):
context['canonical_day'] = canonical_day
context['workout'] = day.training
context['session_form'] = session_form
- context['form_action'] = url
context['weight_units'] = WeightUnit.objects.all()
context['repetition_units'] = RepetitionUnit.objects.all()
return render(request, 'workout/timer.html', context)
diff --git a/wger/manager/views/workout_session.py b/wger/manager/views/workout_session.py
index c7df24f95..691292054 100644
--- a/wger/manager/views/workout_session.py
+++ b/wger/manager/views/workout_session.py
@@ -67,7 +67,6 @@ class WorkoutSessionUpdateView(WgerFormMixin, LoginRequiredMixin, UpdateView):
def get_context_data(self, **kwargs):
context = super(WorkoutSessionUpdateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('manager:session:edit', kwargs={'pk': self.object.id})
context['title'] = _('Edit workout impression for {0}').format(self.object.date)
return context
@@ -112,11 +111,6 @@ class WorkoutSessionAddView(WgerFormMixin, LoginRequiredMixin, CreateView):
def get_context_data(self, **kwargs):
context = super(WorkoutSessionAddView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('manager:session:add',
- kwargs={'workout_pk': self.kwargs['workout_pk'],
- 'year': self.kwargs['year'],
- 'month': self.kwargs['month'],
- 'day': self.kwargs['day']})
context['title'] = _('New workout impression for the {0}'.format(self.get_date()))
return context
@@ -158,8 +152,6 @@ class WorkoutSessionDeleteView(WgerDeleteMixin, LoginRequiredMixin, DeleteView):
logs = '' if not self.kwargs.get('logs') else self.kwargs['logs']
context = super(WorkoutSessionDeleteView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('manager:session:delete', kwargs={'pk': self.object.id,
- 'logs': logs})
context['title'] = _(u'Delete {0}?').format(self.object)
if logs == 'logs':
context['delete_message'] = _('This will delete all weight logs for this day as well.')
diff --git a/wger/nutrition/views/ingredient.py b/wger/nutrition/views/ingredient.py
index 29485adc3..c9a5e03f0 100644
--- a/wger/nutrition/views/ingredient.py
+++ b/wger/nutrition/views/ingredient.py
@@ -143,9 +143,6 @@ class IngredientDeleteView(WgerDeleteMixin,
context = super(IngredientDeleteView, self).get_context_data(**kwargs)
context['title'] = _(u'Delete {0}?').format(self.object)
- context['form_action'] = reverse('nutrition:ingredient:delete',
- kwargs={'pk': self.object.id})
-
return context
@@ -173,7 +170,6 @@ class IngredientEditView(IngredientMixin, LoginRequiredMixin, PermissionRequired
'''
model = Ingredient
- form_action_urlname = 'nutrition:ingredient:edit'
permission_required = 'nutrition.change_ingredient'
def get_context_data(self, **kwargs):
diff --git a/wger/nutrition/views/meal.py b/wger/nutrition/views/meal.py
index 0f3fe499c..a802d0515 100644
--- a/wger/nutrition/views/meal.py
+++ b/wger/nutrition/views/meal.py
@@ -68,9 +68,6 @@ class MealCreateView(WgerFormMixin, CreateView):
# Send some additional data to the template
def get_context_data(self, **kwargs):
context = super(MealCreateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('nutrition:meal:add',
- kwargs={'plan_pk': self.kwargs['plan_pk']})
-
return context
@@ -82,7 +79,6 @@ class MealEditView(WgerFormMixin, UpdateView):
model = Meal
fields = '__all__'
title = ugettext_lazy('Edit meal')
- form_action_urlname = 'nutrition:meal:edit'
def get_success_url(self):
return self.object.plan.get_absolute_url()
diff --git a/wger/nutrition/views/meal_item.py b/wger/nutrition/views/meal_item.py
index 4e2f2da80..0827782ae 100644
--- a/wger/nutrition/views/meal_item.py
+++ b/wger/nutrition/views/meal_item.py
@@ -89,8 +89,6 @@ class MealItemCreateView(WgerFormMixin, CreateView):
Send some additional data to the template
'''
context = super(MealItemCreateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('nutrition:meal_item:add',
- kwargs={'meal_id': self.meal.id})
context['ingredient_searchfield'] = self.request.POST.get('ingredient_searchfield', '')
return context
@@ -111,7 +109,6 @@ class MealItemEditView(WgerFormMixin, UpdateView):
model = MealItem
form_class = MealItemForm
title = ugettext_lazy('Edit meal item')
- form_action_urlname = 'nutrition:meal_item:edit'
template_name = 'meal_item/edit.html'
def get_success_url(self):
diff --git a/wger/nutrition/views/plan.py b/wger/nutrition/views/plan.py
index f387a511d..9a14dce94 100644
--- a/wger/nutrition/views/plan.py
+++ b/wger/nutrition/views/plan.py
@@ -114,7 +114,6 @@ 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')
def get_context_data(self, **kwargs):
@@ -133,7 +132,6 @@ class PlanEditView(WgerFormMixin, UpdateView):
model = NutritionPlan
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 c4dd9fc3c..c6e6429b2 100644
--- a/wger/nutrition/views/unit.py
+++ b/wger/nutrition/views/unit.py
@@ -82,7 +82,6 @@ class WeightUnitCreateView(WgerFormMixin,
model = WeightUnit
fields = ['name']
title = ugettext_lazy('Add new weight unit')
- form_action = reverse_lazy('nutrition:weight_unit:add')
permission_required = 'nutrition.add_ingredientweightunit'
def get_success_url(self):
@@ -104,7 +103,6 @@ class WeightUnitDeleteView(WgerDeleteMixin,
model = WeightUnit
fields = ['name']
success_url = reverse_lazy('nutrition:weight_unit:list')
- form_action_urlname = 'nutrition:weight_unit:delete'
permission_required = 'nutrition.delete_ingredientweightunit'
messages = ugettext_lazy('Successfully deleted')
@@ -127,7 +125,6 @@ class WeightUnitUpdateView(WgerFormMixin,
model = WeightUnit
fields = ['name']
- form_action_urlname = 'nutrition:weight_unit:edit'
permission_required = 'nutrition.change_ingredientweightunit'
def get_success_url(self):
diff --git a/wger/nutrition/views/unit_ingredient.py b/wger/nutrition/views/unit_ingredient.py
index 801daa968..33e66ea07 100644
--- a/wger/nutrition/views/unit_ingredient.py
+++ b/wger/nutrition/views/unit_ingredient.py
@@ -68,13 +68,6 @@ class WeightUnitIngredientCreateView(WgerFormMixin,
title = ugettext_lazy('Add a new weight unit')
permission_required = 'nutrition.add_ingredientweightunit'
- # Send some additional data to the template
- def get_context_data(self, **kwargs):
- context = super(WeightUnitIngredientCreateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('nutrition:unit_ingredient:add',
- kwargs={'ingredient_pk': self.kwargs['ingredient_pk']})
- return context
-
def get_success_url(self):
return reverse('nutrition:ingredient:view', kwargs={'id': self.kwargs['ingredient_pk']})
@@ -108,7 +101,6 @@ class WeightUnitIngredientUpdateView(WgerFormMixin,
model = IngredientWeightUnit
title = ugettext_lazy('Edit a weight unit to ingredient connection')
- form_action_urlname = 'nutrition:unit_ingredient:edit'
permission_required = 'nutrition.add_ingredientweightunit'
def get_success_url(self):
@@ -140,7 +132,6 @@ class WeightUnitIngredientDeleteView(WgerDeleteMixin,
model = IngredientWeightUnit
fields = ('unit', 'gram', 'amount')
title = ugettext_lazy('Delete?')
- form_action_urlname = 'nutrition:unit_ingredient:delete'
permission_required = 'nutrition.add_ingredientweightunit'
def get_success_url(self):
diff --git a/wger/utils/generic_views.py b/wger/utils/generic_views.py
index 8942a6420..a53a5a9ae 100644
--- a/wger/utils/generic_views.py
+++ b/wger/utils/generic_views.py
@@ -18,8 +18,6 @@
import logging
# Django
-from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Submit
from django.contrib import messages
from django.contrib.auth.mixins import PermissionRequiredMixin
from django.http import (
@@ -37,6 +35,8 @@ from django.views.generic.edit import ModelFormMixin
# Third Party
import bleach
+from crispy_forms.helper import FormHelper
+from crispy_forms.layout import Submit
# wger
from wger.utils.constants import (
@@ -120,6 +120,7 @@ class WgerFormMixin(ModelFormMixin):
form_action = ''
form_action_urlname = ''
+
sidebar = ''
'''
Name of a template that will be included in the sidebar
@@ -212,21 +213,12 @@ class WgerFormMixin(ModelFormMixin):
form = super(WgerFormMixin, self).get_form(form_class)
if not hasattr(form, "helper"):
form.helper = FormHelper()
-
form.helper.form_id = 'id-personal-data-form'
form.helper.form_method = 'post'
-
- # When viewing the page on it's own, this is not necessary, but when
- # opening it on a modal dialog, we need to make sure the POST request
- # reaches the correct controller
- if self.form_action_urlname:
- form.helper.form_action = reverse(self.form_action_urlname,
- kwargs={'pk': self.object.id})
- elif self.form_action:
- form.helper.form_action = self.form_action
-
+ form.helper.form_action = self.request.path
form.helper.add_input(Submit('submit', self.submit_text, css_class='btn-success btn-block'))
form.helper.form_class = 'wger-form'
+ self.object
return form
def form_invalid(self, form):
diff --git a/wger/weight/views.py b/wger/weight/views.py
index dfbdcd823..93a2384d8 100644
--- a/wger/weight/views.py
+++ b/wger/weight/views.py
@@ -66,7 +66,6 @@ class WeightAddView(WgerFormMixin, CreateView):
model = WeightEntry
form_class = WeightForm
title = ugettext_lazy('Add weight entry')
- form_action = reverse_lazy('weight:add')
def get_initial(self):
'''
@@ -101,7 +100,6 @@ class WeightUpdateView(WgerFormMixin, UpdateView):
def get_context_data(self, **kwargs):
context = super(WeightUpdateView, self).get_context_data(**kwargs)
- context['form_action'] = reverse('weight:edit', kwargs={'pk': self.object.id})
context['title'] = _('Edit weight entry for the %s') % self.object.date
return context
@@ -211,8 +209,7 @@ class WeightCsvImportFormPreview(FormPreview):
return {'form': form,
'stage_field': self.unused_name('stage'),
- 'state': self.state,
- 'form_action': reverse('weight:import-csv')}
+ 'state': self.state}
def process_preview(self, request, form, context):
context['weight_list'], context['error_list'] = helpers.parse_weight_csv(request,