Changes for django 2.2

[sommitrealweird.git] / sommitrealweird / urls.py

diff --git a/sommitrealweird/urls.py b/sommitrealweird/urls.py
index 0a4b5f3a2c36d9d27e9eb3b446b3812f8a7b7550..6e7cf994fb33567c2b83f830bfa3cc17e9b6e0c4 100644 (file)
--- a/sommitrealweird/urls.py
+++ b/sommitrealweird/urls.py
@@ -2,7 +2,7 @@ from django.conf.urls import include, url
 from django.conf.urls.static import static
 import bpcms.views
 import django.views.static
 from django.conf.urls.static import static
 import bpcms.views
 import django.views.static

-from settings import MEDIA_ROOT, MEDIA_URL, STATIC_URL
+from settings import MEDIA_ROOT, MEDIA_URL, STATIC_ROOT, STATIC_URL

 from blog.feeds import LatestBlogEntries, LatestBlogEntriesRss
 from django.contrib import admin
 
 from blog.feeds import LatestBlogEntries, LatestBlogEntriesRss
 from django.contrib import admin
 


@@ -25,7 +25,8 @@ urlpatterns = [
     # Uncomment this for admin:
     url(r'^$', bpcms.views.document_view, {'slug': 'index'}),
     url(r'^media/(?P<path>.*)$', django.views.static.serve, {'document_root': MEDIA_ROOT, 'show_indexes': True}),
     # Uncomment this for admin:
     url(r'^$', bpcms.views.document_view, {'slug': 'index'}),
     url(r'^media/(?P<path>.*)$', django.views.static.serve, {'document_root': MEDIA_ROOT, 'show_indexes': True}),

-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^static/(?P<path>.*)$', django.views.static.serve, {'document_root': STATIC_ROOT, 'show_indexes': True}),
+    url(r'^admin/', admin.site.urls),

     url(r'^blog/', include('blog.urls')),
     url(r'^photo/', include('photo.urls')),
     #url(r'^photos/', include('photo.urls')),
     url(r'^blog/', include('blog.urls')),
     url(r'^photo/', include('photo.urls')),
     #url(r'^photos/', include('photo.urls')),


@@ -33,4 +34,4 @@ urlpatterns = [
     url(r'^feeds/rss/blog/', LatestBlogEntriesRss()),
     url(r'^feeds/blog/', LatestBlogEntries()),
     url(r'^', include('bpcms.urls'))
     url(r'^feeds/rss/blog/', LatestBlogEntriesRss()),
     url(r'^feeds/blog/', LatestBlogEntries()),
     url(r'^', include('bpcms.urls'))

-] + static(STATIC_URL, document_root=MEDIA_ROOT)
+]