From 8e9a8d8957048ebcedd4d739d64c3636866b347f Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 12 Nov 2018 19:51:18 +0100 Subject: [PATCH] ics is now download file --- rowers/views.py | 27 +++------------------------ templates/newbase.html | 4 ++-- 2 files changed, 5 insertions(+), 26 deletions(-) diff --git a/rowers/views.py b/rowers/views.py index b2ab8752..15f51f08 100644 --- a/rowers/views.py +++ b/rowers/views.py @@ -103,6 +103,7 @@ import rowers.uploads as uploads from django.forms.formsets import formset_factory from django.forms import modelformset_factory import StringIO +import cStringIO from django.contrib.auth.decorators import login_required #,user_passes_test from rowers.decorators import user_passes_test from time import strftime,strptime,mktime,time,daylight @@ -1457,31 +1458,9 @@ def plannedsessions_icsemail_view(request,userid=0): event.add('comment',comment) cal.add_component(event) - icsfilename = 'calendar_{id}.ics'.format(id=request.user.id) - - with open(icsfilename,'wb') as f: - f.write(cal.to_ical()) - res = myqueue(queuehigh,handle_sendemailics, - request.user.first_name, - request.user.last_name, - request.user.email,icsfilename, - emailbounced = r.emailbounced - ) - - - successmessage = "The calendar file was sent to you per email" - messages.info(request,successmessage) - url = reverse(plannedsessions_view, - kwargs = { - 'userid':r.user.id, - }) - startdatestring = startdate.strftime('%Y-%m-%d') - enddatestring = enddate.strftime('%Y-%m-%d') - url+='?when='+startdatestring+'/'+enddatestring - - - response = HttpResponseRedirect(url) + response = HttpResponse(cal.to_ical(),content_type = 'text/plain') + response['Content-Disposition'] = 'attachment; filename="training_plan_%s.ics"' % request.user.id return response diff --git a/templates/newbase.html b/templates/newbase.html index ebeb7bb6..11a5ece0 100644 --- a/templates/newbase.html +++ b/templates/newbase.html @@ -289,14 +289,14 @@ {% endblock %} -
+ {% block ad %}

Prygl Rowing Camps

{% endblock %} -
+