Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add contact field to feedback form
Roland Geider19ffc3938b9d
diff --git a/wger/core/forms.py b/wger/core/forms.pyindex b3b7489be..6c6434817 100644--- a/wger/core/forms.py+++ b/wger/core/forms.py@@ -106,9 +106,16 @@ class FeedbackRegisteredForm(Form):'''Feedback form used for logged in users'''+ contact = CharField(max_length=50,+ min_length=10,+ label=_('Contact'),+ help_text=_('Some way of answering your (email, etc.)'),+ required=False)+comment = CharField(max_length=500,min_length=10,widget=widgets.Textarea,+ label=_('Comment'),help_text=_('What do you want to say?'),required=True)diff --git a/wger/core/templates/form.html b/wger/core/templates/form.htmlindex 9f3e1e238..1ef215080 100644--- a/wger/core/templates/form.html+++ b/wger/core/templates/form.html@@ -24,7 +24,7 @@class="form-horizontal"role="form"{% if enctype %}enctype="{{enctype}}"{% endif %}>- {% render_form_fields form %}+ {% render_form_fields form submit_text %}</form>{% endblock %}@@ -32,4 +32,4 @@<!--Side bar-->-{% block sidebar %}{% if sidebar %}{% include sidebar %}{% endif %}{% endblock %}\ No newline at end of file+{% block sidebar %}{% if sidebar %}{% include sidebar %}{% endif %}{% endblock %}diff --git a/wger/core/templates/user/email_feedback.html b/wger/core/templates/user/email_feedback.htmlnew file mode 100644index 000000000..fb399e705--- /dev/null+++ b/wger/core/templates/user/email_feedback.html@@ -0,0 +1,9 @@+{% if user.is_authenticated %}+Feedback posted by {{user.username}} (ID: {{user.id}})+{% else %}+Feedback posted by an anonymous user+{% endif %}+------------------------------++Contact: {% if form_data.contact %}{{ form_data.contact }}{% else %}no contact{% endif %}+Message: {{ form_data.comment }}diff --git a/wger/core/views/misc.py b/wger/core/views/misc.pyindex 86ebb3077..5f7e1255a 100644--- a/wger/core/views/misc.py+++ b/wger/core/views/misc.py@@ -28,6 +28,8 @@ from django.views.generic import TemplateViewfrom django.contrib import messagesfrom django.contrib.auth.decorators import login_requiredfrom django.contrib.auth import login as django_login+from django.template.loader import render_to_string+from wger.core.forms import FeedbackRegisteredFormfrom wger.core.forms import FeedbackAnonymousForm@@ -147,6 +149,14 @@ class FeedbackClass(FormView):template_name = 'form.html'success_url = reverse_lazy('core:contact')+ def get_initial(self):+ '''+ Fill in the contact, if available+ '''+ if self.request.user.is_authenticated():+ return {'contact': self.request.user.email}+ return {}+def get_context_data(self, **kwargs):'''Set necessary template data to correctly render the form@@ -172,15 +182,16 @@ class FeedbackClass(FormView):def form_valid(self, form):'''- Send an email to the+ Send the feedback to the administrators'''messages.success(self.request, _('Your feedback was successfully sent. Thank you!'))- message = "Feedback posted by an anonymous user"- if self.request.user.is_authenticated():- message = u"Feedback posted by {0}".format(self.request.user.username)- message += (u"\n"- u"Message follows:\n"- u"----------------\n\n{0}".format(form.cleaned_data['comment']))- mail.mail_admins(_('New feedback'), message)+ context = {}+ context['user'] = self.request.user+ context['form_data'] = form.cleaned_data++ subject = 'New feedback'+ message = render_to_string('user/email_feedback.html', context)+ mail.mail_admins(subject, message)+return super(FeedbackClass, self).form_valid(form)diff --git a/wger/software/templates/changelog.html b/wger/software/templates/changelog.htmlindex 5dbb1762b..81404bd28 100644--- a/wger/software/templates/changelog.html+++ b/wger/software/templates/changelog.html@@ -23,6 +23,7 @@</li><li>Show exercise pictures in workout as well</li><li>Allow the user to delete his account and data</li>+ <li>Add contact field to feedback form</li></ul>