CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Fixed #71 -- Consistent building of absolute URIs

Browse Source
This commit is contained in:
Raphael Michel
2015-06-16 23:04:10 +02:00
parent ed8b983f19
commit 7f6e89213f
6 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/pretix/presale/views/checkout.py
View File

@@ -13,6 +13,7 @@ from django.utils.translation import ugettext_lazy as _
from pretix.base.services.mail import mail
from pretix.base.models import CartPosition, QuestionAnswer, Quota, Order, OrderPosition
from pretix.base.signals import register_payment_providers
from pretix.helpers.urls import build_absolute_uri
from pretix.presale.forms.checkout import QuestionsForm
from pretix.presale.views import EventViewMixin, CartDisplayMixin, EventLoginRequiredMixin
@@ -304,7 +305,7 @@ class OrderConfirm(EventViewMixin, CartDisplayMixin, EventLoginRequiredMixin, Ch
{
'user': request.user, 'order': order,
'event': request.event,
'url': request.build_absolute_uri(self.get_order_url(order)),
'url': build_absolute_uri(self.get_order_url(order)),
'payment': self.payment_provider.order_pending_mail_render(order)
},
request.event

5
src/pretix/presale/views/event.py
View File

@@ -14,6 +14,7 @@ from django.utils.translation import ugettext_lazy as _
from django.conf import settings
from pretix.base.services.mail import mail
from pretix.base.models import User
from pretix.helpers.urls import build_absolute_uri
from pretix.presale.forms.auth import GlobalRegistrationForm, LocalRegistrationForm, PasswordForgotForm, \
PasswordRecoverForm
from pretix.presale.forms.auth import LoginForm
@@ -187,10 +188,10 @@ class EventForgot(EventViewMixin, TemplateView):
{
'user': user,
'event': self.request.event,
'url': settings.SITE_URL + reverse('presale:event.forgot.recover', kwargs={
'url': build_absolute_uri(reverse('presale:event.forgot.recover', kwargs={
'event': self.request.event.slug,
'organizer': self.request.event.organizer.slug,
}) + '?token=' + self.generate_token(user),
}) + '?token=' + self.generate_token(user)),
},
self.request.event
)