fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Str/bytes fix for publishing audiobooks.
[wolnelektury.git]
/
src
/
wolnelektury
/
urls.py
diff --git
a/src/wolnelektury/urls.py
b/src/wolnelektury/urls.py
index
fbc458d
..
8b02fda
100644
(file)
--- a/
src/wolnelektury/urls.py
+++ b/
src/wolnelektury/urls.py
@@
-25,6
+25,7
@@
urlpatterns = [
url(r'^uzytkownik/signup/$', views.RegisterFormView(), name='register'),
url(r'^uzytkownik/logout/$', views.logout_then_redirect, name='logout'),
url(r'^uzytkownik/zaloguj-utworz/$', views.LoginRegisterFormView(), name='login_register'),
url(r'^uzytkownik/signup/$', views.RegisterFormView(), name='register'),
url(r'^uzytkownik/logout/$', views.logout_then_redirect, name='logout'),
url(r'^uzytkownik/zaloguj-utworz/$', views.LoginRegisterFormView(), name='login_register'),
+ url(r'^uzytkownik/social/signup/$', views.SocialSignupView.as_view(), name='socialaccount_signup'),
# Includes.
url(r'^latests_blog_posts.html$', views.latest_blog_posts, name='latest_blog_posts'),
# Includes.
url(r'^latests_blog_posts.html$', views.latest_blog_posts, name='latest_blog_posts'),
@@
-50,6
+51,13
@@
urlpatterns += [
url(r'^formularz/', include('contact.urls')),
url(r'^isbn/', include('isbn.urls')),
url(r'^formularz/', include('contact.urls')),
url(r'^isbn/', include('isbn.urls')),
+ url(r'^paypal/app-form/$', RedirectView.as_view(
+ url='/towarzystwo/dolacz/?app=1', permanent=True)),
+
+ url(r'^paypal/', include('paypal.urls')),
+ url(r'^powiadomienie/', include('push.urls')),
+ url(r'^towarzystwo/', include('club.urls')),
+
# Admin panel
url(r'^admin/catalogue/book/import$', catalogue.views.import_book, name='import_book'),
url(r'^admin/catalogue/picture/import$', picture.views.import_picture, name='import_picture'),
# Admin panel
url(r'^admin/catalogue/book/import$', catalogue.views.import_book, name='import_book'),
url(r'^admin/catalogue/picture/import$', picture.views.import_picture, name='import_picture'),
@@
-63,11
+71,6
@@
urlpatterns += [
url(r'^szukaj/', include('search.urls')),
url(r'^szukaj/', include('search.urls')),
- # Static files
- url(r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:], django.views.static.serve,
- {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
- url(r'^%s(?P<path>.*)$' % settings.STATIC_URL[1:], django.views.static.serve,
- {'document_root': settings.STATIC_ROOT, 'show_indexes': True}),
url(r'^i18n/', include('django.conf.urls.i18n')),
]
url(r'^i18n/', include('django.conf.urls.i18n')),
]
@@
-89,4
+92,15
@@
urlpatterns += [
urlpatterns += [
url(r'^error-test/$', views.exception_test),
urlpatterns += [
url(r'^error-test/$', views.exception_test),
+ # url(r'^post-test/$', views.post_test),
]
]
+
+
+if settings.DEBUG:
+ urlpatterns += [
+ # Static files
+ url(r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:], django.views.static.serve,
+ {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
+ url(r'^%s(?P<path>.*)$' % settings.STATIC_URL[1:], django.views.static.serve,
+ {'document_root': settings.STATIC_ROOT, 'show_indexes': True}),
+ ]