search fix

[wolnelektury.git] / src / wolnelektury / urls.py

diff --git a/src/wolnelektury/urls.py b/src/wolnelektury/urls.py
index 09b4d3d..6208d19 100644 (file)
--- a/src/wolnelektury/urls.py
+++ b/src/wolnelektury/urls.py
@@ -8,6 +8,7 @@ from django.views.generic import RedirectView
 import django.views.static
 from annoy.utils import banner_exempt
 import catalogue.views
 import django.views.static
 from annoy.utils import banner_exempt
 import catalogue.views

+import club.views

 import picture.views
 from . import views
 
 import picture.views
 from . import views
 


@@ -29,6 +30,7 @@ urlpatterns = [
 ]
 
 urlpatterns += [
 ]
 
 urlpatterns += [

+    path('eksperymenty/', include('experiments.urls')),

     path('katalog/', include('catalogue.urls')),
     path('opds/', include('opds.urls')),
     path('sugestia/', include('suggest.urls')),
     path('katalog/', include('catalogue.urls')),
     path('opds/', include('opds.urls')),
     path('sugestia/', include('suggest.urls')),


@@ -48,19 +50,16 @@ urlpatterns += [
     path('messaging/', include('messaging.urls')),
     path('re/', include('redirects.urls')),
     path('stats/', include('stats.urls')),
     path('messaging/', include('messaging.urls')),
     path('re/', include('redirects.urls')),
     path('stats/', include('stats.urls')),

-
-    path('paypal/app-form/', RedirectView.as_view(
-        url='/towarzystwo/?pk_campaign=aplikacja', permanent=False)),
-    path('towarzystwo/dolacz/', RedirectView.as_view(
-        url='/towarzystwo/', permanent=False)),
-

     path('paypal/', include('paypal.urls')),
     path('powiadomienie/', include('push.urls')),
     path('paypal/', include('paypal.urls')),
     path('powiadomienie/', include('push.urls')),

-    path('towarzystwo/', include('club.urls')),
-    #path('pomagam/', include('club.urls2')),
-    path('pomagam/', RedirectView.as_view(
-        url='/towarzystwo/', permanent=False)),
-    
+    path('pomagam/', include('club.urls')),
+    path('szkola-', include('education.urls')),
+    path('towarzystwo/notify/<int:pk>/',  club.views.PayUNotifyView.as_view(), name='club_payu_notify'),
+    path('towarzystwo/', RedirectView.as_view(url='/pomagam/', permanent=False, query_string=True)),
+    path('towarzystwo/<path:path>', RedirectView.as_view(
+        url='/pomagam/%(path)s', permanent=False)),
+
+    path('chunks/', include('chunks.urls')),

 
     # Admin panel
     path('admin/catalogue/book/import', catalogue.views.import_book, name='import_book'),
 
     # Admin panel
     path('admin/catalogue/book/import', catalogue.views.import_book, name='import_book'),


@@ -76,7 +75,6 @@ urlpatterns += [
     path('szukaj/', include('search.urls')),
 
     path('i18n/', include('django.conf.urls.i18n')),
     path('szukaj/', include('search.urls')),
 
     path('i18n/', include('django.conf.urls.i18n')),

-    path('forum/', include('machina.urls')),

 ]
 
 urlpatterns += [
 ]
 
 urlpatterns += [


@@ -108,7 +106,12 @@ if settings.DEBUG:
     ] + urlpatterns
 
 if settings.DEBUG:
     ] + urlpatterns
 
 if settings.DEBUG:

+    import functools
+    from django.views.defaults import page_not_found, server_error

     urlpatterns += [
     urlpatterns += [

+        path('error/500/', server_error),
+        path('error/404/', functools.partial(page_not_found, exception=None)),
+

         # Static files
         path('%s<path:path>' % settings.MEDIA_URL[1:], django.views.static.serve,
            {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
         # Static files
         path('%s<path:path>' % settings.MEDIA_URL[1:], django.views.static.serve,
            {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),