From 744c9970bf6470f6540eb1a7d00b8e6b79a21c5e Mon Sep 17 00:00:00 2001 From: Andrii Kurinnyi Date: Wed, 26 Jun 2013 16:49:28 -0700 Subject: [PATCH] Updated sample project to work with Django 1.5 --- sample_project/requirements.txt | 1 + sample_project/settings.py | 4 +++- sample_project/urls.py | 7 +++++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/sample_project/requirements.txt b/sample_project/requirements.txt index f61efdb..0cfbb20 100644 --- a/sample_project/requirements.txt +++ b/sample_project/requirements.txt @@ -1 +1,2 @@ django>=1.5 +requests>=1.2.3 diff --git a/sample_project/settings.py b/sample_project/settings.py index f29affd..75ef751 100644 --- a/sample_project/settings.py +++ b/sample_project/settings.py @@ -60,7 +60,7 @@ # URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a # trailing slash. # Examples: "http://foo.com/media/", "/media/". -ADMIN_MEDIA_PREFIX = '/admin-media/' +STATIC_URL = '/static/' # Make this unique, and don't share it with anybody. SECRET_KEY = '=21(@m#)-$5r(cc110zpy$v4od_45r!k1nz!uq@v$w17&!i8=%' @@ -83,6 +83,7 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', 'django.contrib.redirects.middleware.RedirectFallbackMiddleware', @@ -104,6 +105,7 @@ 'django.contrib.sites', 'django.contrib.admin', 'django.contrib.redirects', + 'django.contrib.staticfiles', 'authorizenet', 'samplestore', ) diff --git a/sample_project/urls.py b/sample_project/urls.py index 5a47df5..30b1476 100644 --- a/sample_project/urls.py +++ b/sample_project/urls.py @@ -1,6 +1,7 @@ -from django.conf.urls.defaults import url, include, patterns +from django.conf.urls import url, include, patterns from django.conf import settings from django.views.generic.base import RedirectView +from django.contrib.staticfiles.urls import staticfiles_urlpatterns # Uncomment the next two lines to enable the admin: from django.contrib import admin @@ -16,6 +17,8 @@ url(r'^admin/doc/', include('django.contrib.admindocs.urls')), url(r'^admin/', include(admin.site.urls)), - + url(r'^media/(?P.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}), ) + +urlpatterns += staticfiles_urlpatterns()