Changed plugin URL config to create better error messages,

fixed an import error
This commit is contained in:
Raphael Michel
2015-08-20 22:37:38 +02:00
parent 4f28c01692
commit aed73b0c61
2 changed files with 3 additions and 7 deletions

View File

@@ -9,12 +9,10 @@ from decimal import Decimal
from django import forms from django import forms
from django.contrib import messages from django.contrib import messages
from django.shortcuts import redirect, render from django.shortcuts import redirect, render
from django.utils.decorators import method_decorator from django.utils.functional import cached_property
from django.utils.timezone import now from django.utils.timezone import now
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from django.views.decorators.debug import sensitive_post_parameters
from django.views.generic import TemplateView from django.views.generic import TemplateView
from pip.utils import cached_property
from pretix.base.models import Order, Quota from pretix.base.models import Order, Quota
from pretix.base.services.orders import mark_order_paid from pretix.base.services.orders import mark_order_paid

View File

@@ -1,4 +1,4 @@
import importlib import importlib.util
from django.apps import apps from django.apps import apps
from django.conf import settings from django.conf import settings
@@ -22,13 +22,11 @@ if settings.DEBUG:
pluginpatterns = [] pluginpatterns = []
for app in apps.get_app_configs(): for app in apps.get_app_configs():
if hasattr(app, 'PretixPluginMeta'): if hasattr(app, 'PretixPluginMeta'):
try: if importlib.util.find_spec(app.name + '.urls'):
urlmod = importlib.import_module(app.name + '.urls') urlmod = importlib.import_module(app.name + '.urls')
pluginpatterns.append( pluginpatterns.append(
url(r'', include(urlmod, namespace=app.label)) url(r'', include(urlmod, namespace=app.label))
) )
except ImportError:
pass
urlpatterns.append( urlpatterns.append(
url(r'', include(pluginpatterns, namespace='plugins')) url(r'', include(pluginpatterns, namespace='plugins'))
) )