Revision f76c5e52
b/snf-cyclades-app/synnefo/ui/templates/feedback_mail.txt | ||
---|---|---|
5 | 5 |
{{ allow_data_send }} |
6 | 6 |
|
7 | 7 |
User info: |
8 |
Username: {{ request.user_uniq }} |
|
8 |
ID: {{ request.user_uniq }} |
|
9 |
Email: {{ email }} |
|
9 | 10 |
|
10 | 11 |
User application data: |
11 |
{{ data|safe }}
|
|
12 |
{{ data }} |
|
12 | 13 |
|
b/snf-cyclades-app/synnefo/ui/views.py | ||
---|---|---|
439 | 439 |
|
440 | 440 |
message = request.POST.get("feedback-msg") |
441 | 441 |
data = request.POST.get("feedback-data") |
442 |
if isinstance(request.user.get('email'), list): |
|
443 |
email = request.user.get('email')[0] |
|
444 |
else: |
|
445 |
email = request.user.get('email') |
|
442 | 446 |
|
443 | 447 |
# default to True (calls from error pages) |
444 | 448 |
allow_data_send = request.POST.get("feedback-submit-data", True) |
445 | 449 |
|
446 | 450 |
mail_subject = unicode(_("Feedback from synnefo application")) |
447 | 451 |
|
448 |
mail_context = {'message': message, 'data': data, |
|
452 |
mail_context = {'message': message, 'data': data, 'email': email,
|
|
449 | 453 |
'allow_data_send': allow_data_send, 'request': request} |
450 | 454 |
mail_content = render_to_string("feedback_mail.txt", mail_context) |
451 | 455 |
|
452 | 456 |
send_mail(mail_subject, mail_content, FEEDBACK_EMAIL_FROM, |
453 |
dict(FEEDBACK_CONTACTS).values(), fail_silently=False) |
|
454 |
|
|
455 |
return HttpResponse('{"status":"send"}'); |
|
457 |
dict(FEEDBACK_CONTACTS).values(), fail_silently=False) |
|
456 | 458 |
|
459 |
return HttpResponse('{"status":"send"}') |
Also available in: Unified diff