Self hosted FLOSS fitness/workout, nutrition and weight tracker
Use a confirmation template
Roland Geider077d555e7415
diff --git a/wger/core/templates/confirm.html b/wger/core/templates/confirm.htmlnew file mode 100644index 000000000..c25fe9bd4--- /dev/null+++ b/wger/core/templates/confirm.html@@ -0,0 +1,7 @@+{% load i18n crispy_forms_tags %}++<h4>{{ title }}</h4>+{% if confirm_message %}+ <p>{{ confirm_message }}</p>+{% endif %}+{% crispy form %}diff --git a/wger/core/views/user.py b/wger/core/views/user.pyindex 7aa778142..8a2e87d3b 100644--- a/wger/core/views/user.py+++ b/wger/core/views/user.py@@ -336,7 +336,7 @@ class UserActivationConfirmMixin:(e.g. POST), not GET."""- confirm_message = ''+ confirm_title = ''success_message = ''new_is_active = None@@ -347,14 +347,14 @@ class UserActivationConfirmMixin:form.helper.form_method = 'post'form.helper.form_action = request.pathform.helper.layout = Layout(- ButtonHolder(Submit('submit', self.confirm_message, css_class='btn-warning btn-block'))+ ButtonHolder(Submit('submit', self.confirm_title, css_class='btn-warning btn-block')))return render(request,- 'delete.html',+ 'confirm.html',{- 'title': self.confirm_message,- 'delete_message': str(edit_user),+ 'title': self.confirm_title,+ 'confirm_message': str(edit_user),'form': form,},)@@ -379,7 +379,7 @@ class UserDeactivateView(model = Userpermission_required = ('gym.manage_gym', 'gym.manage_gyms', 'gym.gym_trainer')- confirm_message = gettext_lazy('Deactivate this user?')+ confirm_title = gettext_lazy('Deactivate this user?')success_message = gettext_lazy('The user was successfully deactivated')new_is_active = False@@ -427,7 +427,7 @@ class UserActivateView(model = Userpermission_required = ('gym.manage_gym', 'gym.manage_gyms', 'gym.gym_trainer')- confirm_message = gettext_lazy('Activate this user?')+ confirm_title = gettext_lazy('Activate this user?')success_message = gettext_lazy('The user was successfully activated')new_is_active = Truediff --git a/wger/gym/views/gym.py b/wger/gym/views/gym.pyindex adecb4b75..b8e8f6645 100644--- a/wger/gym/views/gym.py+++ b/wger/gym/views/gym.py@@ -278,9 +278,10 @@ def reset_user_password(request, user_pk):)return render(request,- 'delete.html',+ 'confirm.html',{- 'title': _('Reset the password for %(user)s?') % {'user': user},+ 'title': _('Reset the password for this user?'),+ 'confirm_message': str(user),'form': form,},)