repaired the invocation ot I_just_pledged emailshare [#27785469]
parent
296b5b5b20
commit
ea9ac7508e
|
@ -36,7 +36,7 @@
|
|||
<ul class="social menu pledge">
|
||||
<a href="https://www.facebook.com/sharer.php?u={% url work work.id|urlencode:"" %}"><li class="facebook first"><span>Facebook</span></li></a>
|
||||
<a href="https://twitter.com/intent/tweet?url={% url work work.id|urlencode:"" %}&text=I%20just%20pledged%20to%20unglue%20{{ work.title|urlencode }}%20at%20%40unglueit.%20Will%20you%20join%20me%3F"><li class="twitter"><span>Twitter</span></li></a>
|
||||
<a href="{% url emailshare %}?next={% url work work.id|urlencode:"" %}"><li class="email"><span>Email</span></li></a>
|
||||
<a href="{% url emailshare 'pledge' %}?next={% url work work.id|urlencode:"" %}"><li class="email"><span>Email</span></li></a>
|
||||
<a href="#" id="embed"><li class="embed"><span>Embed</span></li></a>
|
||||
</ul>
|
||||
</div>
|
||||
|
|
|
@ -57,7 +57,7 @@ urlpatterns = patterns(
|
|||
url('^404testing/$', direct_to_template, {'template': '404.html'}),
|
||||
url('^500testing/$', direct_to_template, {'template': '500.html'}),
|
||||
url('^robots.txt$', direct_to_template, {'template': 'robots.txt', 'mimetype': 'text/plain'}),
|
||||
url(r"^emailshare/$", "emailshare", name="emailshare"),
|
||||
url(r"^emailshare/(?P<action>\w*)/?$", "emailshare", name="emailshare"),
|
||||
url(r"^feedback/$", "feedback", name="feedback"),
|
||||
url(r"^feedback/thanks/$", TemplateView.as_view(template_name="thanks.html")),
|
||||
url(r"^press/$", TemplateView.as_view(template_name="press.html"),
|
||||
|
|
|
@ -1779,7 +1779,7 @@ def work_goodreads(request, work_id):
|
|||
return HttpResponseRedirect(url)
|
||||
|
||||
@login_required
|
||||
def emailshare(request):
|
||||
def emailshare(request, action):
|
||||
if request.method == 'POST':
|
||||
form=EmailShareForm(request.POST)
|
||||
if form.is_valid():
|
||||
|
@ -1798,15 +1798,13 @@ def emailshare(request):
|
|||
|
||||
try:
|
||||
next = request.GET['next']
|
||||
if "pledge" in request.path:
|
||||
work_id = next.split('=')[1]
|
||||
work = models.Work.objects.get(pk=int(work_id))
|
||||
work_id = next.split('/')[-2]
|
||||
work_id = int(work_id)
|
||||
work = models.Work.objects.get(pk=work_id)
|
||||
if action == 'pledge':
|
||||
message = render_to_string('emails/i_just_pledged.txt',{'request':request,'work':work,'site': Site.objects.get_current()})
|
||||
subject = "Help me unglue "+work.title
|
||||
else:
|
||||
work_id = next.split('/')[-2]
|
||||
work_id = int(work_id)
|
||||
work = models.Work.objects.get(pk=work_id)
|
||||
try:
|
||||
status = work.last_campaign().status
|
||||
except:
|
||||
|
|
Loading…
Reference in New Issue