summaryrefslogtreecommitdiffstats
path: root/apps/patchwork/urls.py
diff options
context:
space:
mode:
authorStephen Finucane <stephenfinucane@hotmail.com>2015-04-07 22:20:53 +0100
committerJeremy Kerr <jk@ozlabs.org>2015-05-03 13:46:52 +0800
commitd4a2c1f8792f52fec0c881ab38c91635840a50c0 (patch)
treef08cb31b6c2ad4a80bacbf9ba8a2b8b2b2cdca6d /apps/patchwork/urls.py
parentc641660e041fdf932bad89681c167328ee85249a (diff)
downloadpatchwork-d4a2c1f8792f52fec0c881ab38c91635840a50c0.tar.bz2
patchwork-d4a2c1f8792f52fec0c881ab38c91635840a50c0.tar.xz
Integrate 'django.contrib.staticfiles'
Rather than providing a custom solution for serving static files, use the solution provided in the upstream Django source. This allows us to remove the top-level 'urls.py' file. Signed-off-by: Stephen Finucane <stephenfinucane@hotmail.com> Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Diffstat (limited to 'apps/patchwork/urls.py')
-rw-r--r--apps/patchwork/urls.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/apps/patchwork/urls.py b/apps/patchwork/urls.py
index 9b681f9..b28eb90 100644
--- a/apps/patchwork/urls.py
+++ b/apps/patchwork/urls.py
@@ -17,12 +17,16 @@
# along with Patchwork; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-from django.conf.urls import patterns, url
+from django.conf.urls import patterns, url, include
from django.conf import settings
+from django.contrib import admin
from django.contrib.auth import views as auth_views
+admin.autodiscover()
+
urlpatterns = patterns('',
- # Example:
+ url(r'^admin/', include(admin.site.urls)),
+
(r'^$', 'patchwork.views.projects'),
(r'^project/(?P<project_id>[^/]+)/list/$', 'patchwork.views.patch.list'),
(r'^project/(?P<project_id>[^/]+)/$', 'patchwork.views.project.project'),