CGM_Public/pretix_original
2
0
Fork 1
mirror of https://github.com/pretix/pretix.git synced 2026-05-05 15:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Proper namespaces for plugin URLs

Browse Source
This commit is contained in:
Raphael Michel
2015-04-16 09:35:18 +02:00
parent 3c827be4b1
commit d981998a40
8 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/plugins/banktransfer/signals.py
View File

@@ -19,11 +19,11 @@ def control_nav_import(sender, request=None, **kwargs):
return [
{
'label': _('Import bank data'),
'url': reverse('plugins:banktransfer.import', kwargs={
'url': reverse('plugins:banktransfer:import', kwargs={
'event': request.event.slug,
'organizer': request.event.organizer.slug,
}),
'active': (url.namespace == 'plugins' and url.url_name == 'banktransfer.import'),
'active': (url.namespace == 'plugins:banktransfer' and url.url_name == 'import'),
'icon': 'upload',
}
]

2
src/pretix/plugins/banktransfer/urls.py
View File

@@ -5,5 +5,5 @@ from .views import *
urlpatterns = [
url(r'^control/event/(?P<organizer>[^/]+)/(?P<event>[^/]+)/banktransfer/import/', ImportView.as_view(),
name='banktransfer.import'),
name='import'),
]

2
src/pretix/plugins/banktransfer/views.py
View File

@@ -125,7 +125,7 @@ class ImportView(EventPermissionRequiredMixin, TemplateView):
})
def redirect_back(self):
return redirect(reverse('plugins:banktransfer.import', kwargs={
return redirect(reverse('plugins:banktransfer:import', kwargs={
'event': self.request.event.slug,
'organizer': self.request.event.organizer.slug,
}))

4
src/pretix/plugins/paypal/payment.py
View File

@@ -88,8 +88,8 @@ class Paypal(BasePaymentProvider):
"payment_method": "paypal",
},
"redirect_urls": {
"return_url": request.build_absolute_uri(reverse('plugins:paypal.return')),
"cancel_url": request.build_absolute_uri(reverse('plugins:paypal.abort')),
"return_url": request.build_absolute_uri(reverse('plugins:paypal:return')),
"cancel_url": request.build_absolute_uri(reverse('plugins:paypal:abort')),
},
"transactions": [
{

2
src/pretix/plugins/paypal/templates/pretixplugins/paypal/pending.html
View File

@@ -5,7 +5,7 @@
Our attempt to execute your Payment via PayPal has failed. Please try again or contact us.
{% endblocktrans %}</p>
<p>
<a href="{% url "plugins:paypal.retry" order=order.code %}" class="btn btn-default">{% trans "Try again" %}</a>
<a href="{% url "plugins:paypal:retry" order=order.code %}" class="btn btn-default">{% trans "Try again" %}</a>
</p>
{% else %}
<p>{% blocktrans trimmed %}

4
src/pretix/plugins/paypal/views.py
View File

@@ -73,10 +73,10 @@ def retry(request, order):
"payment_method": "paypal",
},
"redirect_urls": {
"return_url": request.build_absolute_uri(reverse('plugins:paypal.retry', kwargs={
"return_url": request.build_absolute_uri(reverse('plugins:paypal:retry', kwargs={
'order': order.code
})),
"cancel_url": request.build_absolute_uri(reverse('plugins:paypal.retry', kwargs={
"cancel_url": request.build_absolute_uri(reverse('plugins:paypal:retry', kwargs={
'order': order.code
})),
},