split admin urls in admin_url for django admin and custom/urls for custom admin

1 files changed, 10 insertions, 6 deletions

diff --git a/webapp/webapp/urls.py b/webapp/webapp/urls.py
index ebed7a0..4e6dbf7 100644
--- a/webapp/webapp/urls.py
+++ b/webapp/webapp/urls.py
@@ -3,14 +3,18 @@ import os
 from django.conf.urls.defaults import patterns, include, url
 from django.conf import settings
 
-from utils.decorators import *
+from utils.decorators import decorator_include, superuser_required
 from sociologist.decorators import sociologist_required
 from pollster.decorators import pollster_required
 
 
-urlpatterns = patterns('',
+urlpatterns = patterns(
+    '',
     url(r'^accounts/', include('accounts.urls', namespace="accounts")),
-    url(r'^admin/', decorator_include(superuser_required, 'custom_admin.urls')),
+    url(r'^admin/', decorator_include(superuser_required,
+        'custom_admin.admin_urls')),
+    url(r'^admin/', decorator_include(superuser_required, 'custom_admin.urls',
+        namespace="custom_admin")),
     url(r'^manager/', decorator_include(
         sociologist_required, 'sociologist.urls', namespace="sociologist")),
     url(r'^polls/', decorator_include(
@@ -21,7 +25,8 @@ urlpatterns = patterns('',
 
 if settings.DEBUG:
 
-    urlpatterns += patterns('django.views.static',
+    urlpatterns += patterns(
+        'django.views.static',
         (
             r'^%s(?P<path>.*)$' % settings.MEDIA_URL[1:],
             'serve',
@@ -32,7 +37,6 @@ if settings.DEBUG:
         url(r'^jasmine/mustache_templates/(?P<path>.*)$', 'serve', {
             'document_root': os.path.join(
                 settings.PROJECT_ROOT + '/../polls/templates/', "mustache",
-            )}
-        ),
+            )}),
         url(r'jasmine/', include('django_jasmine.urls')),
     )