Upgrade to django 1.8, ++

This commit is contained in:
nikolark committed 2015-11-17 13:12:37 +01:00
1 parent 8c004276a7
commit b47ee8f832
22 files changed
+767 -1051

No files matched your search

+15 -7
View File
@@ -1,17 +1,25 @@
from django.conf import settings
from django.conf.urls import patterns, include, url
from django.conf.urls import include, url
from django.contrib import admin
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
from main import urls as main_urls
admin.autodiscover()
urlpatterns = patterns('',
url(r'^$', 'main.views.register', name='home'),
url(r'', include('main.urls')),
urlpatterns = [
url(r'', include(main_urls)),
url(r'^accounts/login/$', 'django.contrib.auth.views.login', name='login'),
url(r'^logout/$', 'main.views.logout', name='logout'),
url(r'^accounts/logout/$', 'main.views.users.logout', name='logout'),
url(r'^admin/', include(admin.site.urls)),
)
]
if settings.DEBUG:
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
urlpatterns += staticfiles_urlpatterns()
urlpatterns += [
url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
'document_root': settings.MEDIA_ROOT,
})
]