Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Crispipy the delete form template as well

Rolanda300ef153b88
diff --git a/wger/core/templates/delete.html b/wger/core/templates/delete.html
index 3c8f73121..596f8ed46 100644
--- a/wger/core/templates/delete.html
+++ b/wger/core/templates/delete.html
@@ -1,5 +1,5 @@
{% extends extend_template %}
-{% load i18n static wger_extras %}
+{% load i18n crispy_forms_tags %}
<!--
Title
@@ -11,29 +11,13 @@
Main Content
-->
{% block content %}
-<form action="{{form_action}}"
- method="post"
- class="wger-form">
- {% csrf_token %}
-
- <div class="form-group">
- <div class="col-xs-3 align-right">
- <span class="{% fa_class 'exclamation-triangle' '3x' %} "></span>
- </div>
-
- <div class="col-xs-9">
- {% trans "Are you sure you want to delete this? This action cannot be undone." %}
- {{ delete_message }}
- </div>
+ <div class="wger-form">
+ <p>{% trans "Are you sure you want to delete this? This action cannot be undone." %}</p>
+ {% if delete_message %}
+ <p>{{ delete_message }}</p>
+ {% endif %}
+ {% crispy form %}
</div>
- {% trans 'Yes, delete' as submit_text %}
- {% render_form_submit submit_text 'danger' %}
-</form>
{% endblock %}
-
-<!--
- Side bar
--->
-{% block sidebar %}{{sidebar|safe}}{% endblock %}
diff --git a/wger/exercises/views/categories.py b/wger/exercises/views/categories.py
index 149ba7f91..fb1a945ea 100644
--- a/wger/exercises/views/categories.py
+++ b/wger/exercises/views/categories.py
@@ -114,7 +114,7 @@ class ExerciseCategoryDeleteView(WgerDeleteMixin,
model = ExerciseCategory
fields = ('name',)
success_url = reverse_lazy('exercise:category:list')
- delete_message = ugettext_lazy('This will also delete all exercises in this category.')
+ delete_message_extra = ugettext_lazy('This will also delete all exercises in this category.')
messages = ugettext_lazy('Successfully deleted')
permission_required = 'exercises.delete_exercisecategory'
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index 5185f6edc..78f156600 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -320,7 +320,7 @@ class ExerciseDeleteView(WgerDeleteMixin,
'muscles_secondary',
'equipment')
success_url = reverse_lazy('exercise:exercise:overview')
- delete_message = ugettext_lazy('This will delete the exercise from all workouts.')
+ delete_message_extra = ugettext_lazy('This will delete the exercise from all workouts.')
messages = ugettext_lazy('Successfully deleted')
permission_required = 'exercises.delete_exercise'
diff --git a/wger/manager/views/workout_session.py b/wger/manager/views/workout_session.py
index 691292054..b8595cbd7 100644
--- a/wger/manager/views/workout_session.py
+++ b/wger/manager/views/workout_session.py
@@ -154,5 +154,5 @@ class WorkoutSessionDeleteView(WgerDeleteMixin, LoginRequiredMixin, DeleteView):
context = super(WorkoutSessionDeleteView, self).get_context_data(**kwargs)
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.')
+ self.delete_message_extra = _('This will delete all weight logs for this day as well.')
return context
diff --git a/wger/utils/generic_views.py b/wger/utils/generic_views.py
index a53a5a9ae..6c0c02ab6 100644
--- a/wger/utils/generic_views.py
+++ b/wger/utils/generic_views.py
@@ -24,11 +24,8 @@ from django.http import (
HttpResponseForbidden,
HttpResponseRedirect
)
-from django.template.context_processors import csrf
-from django.urls import (
- reverse,
- reverse_lazy
-)
+from django.urls import reverse_lazy
+from django.utils.text import slugify
from django.utils.translation import ugettext_lazy
from django.views.generic import TemplateView
from django.views.generic.edit import ModelFormMixin
@@ -36,7 +33,11 @@ from django.views.generic.edit import ModelFormMixin
# Third Party
import bleach
from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Submit
+from crispy_forms.layout import (
+ ButtonHolder,
+ Layout,
+ Submit
+)
# wger
from wger.utils.constants import (
@@ -213,12 +214,11 @@ 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_id = slugify(self.request.path)
form.helper.form_method = 'post'
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):
@@ -254,7 +254,8 @@ class WgerDeleteMixin(ModelFormMixin):
form_action = ''
form_action_urlname = ''
title = ''
- delete_message = ''
+ delete_message_extra = ''
+ delete_message = ugettext_lazy('Yes, delete')
template_name = 'delete.html'
messages = ''
@@ -266,23 +267,11 @@ class WgerDeleteMixin(ModelFormMixin):
# Call the base implementation first to get a context
context = super(WgerDeleteMixin, self).get_context_data(**kwargs)
- # CSRF token
- context.update(csrf(self.request))
-
- # 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:
- context['form_action'] = reverse(self.form_action_urlname,
- kwargs={'pk': self.object.id})
- elif self.form_action:
- context['form_action'] = self.form_action
-
# Set the title
context['title'] = self.title
# Additional delete message
- context['delete_message'] = self.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
@@ -290,6 +279,21 @@ class WgerDeleteMixin(ModelFormMixin):
return context
+ def get_form(self, form_class=None):
+ """Return an instance of the form to be used in this view."""
+ form = super(WgerDeleteMixin, self).get_form(form_class)
+ if not hasattr(form, "helper"):
+ form.helper = FormHelper()
+ form.helper.form_id = slugify(self.request.path)
+ form.helper.form_method = 'post'
+ form.helper.form_action = self.request.path
+ form.helper.layout = Layout(
+ ButtonHolder(
+ Submit('submit', self.delete_message, css_class='btn-warning btn-block')
+ )
+ )
+ return form
+
def dispatch(self, request, *args, **kwargs):
'''
Custom dispatch method.