Skip to content

Commit

Permalink
Updated urls to work without patterns since patterns is being deprecated
Browse files Browse the repository at this point in the history
  • Loading branch information
epicserve committed Feb 15, 2016
1 parent f61e6f6 commit 0a5a3ef
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 10 deletions.
9 changes: 5 additions & 4 deletions categories/urls.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.conf.urls import patterns, url
from django.conf.urls import url
from .models import Category
from . import views

try:
from django.views.generic import DetailView, ListView
Expand All @@ -15,12 +16,12 @@
'queryset': Category.objects.filter(level=0)
}

urlpatterns = patterns('',
urlpatterns = (
url(
r'^$', ListView.as_view(**categorytree_dict), name='categories_tree_list'
),
)

urlpatterns += patterns('categories.views',
url(r'^(?P<path>.+)/$', 'category_detail', name='categories_category'),
urlpatterns += (
url(r'^(?P<path>.+)/$', views.category_detail, name='categories_category'),
)
14 changes: 8 additions & 6 deletions example/urls.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
from django.conf.urls import patterns, include
from django.conf.urls import include, url

# Uncomment the next two lines to enable the admin:
from django.contrib import admin
from django.views.static import serve

admin.autodiscover()


import os

ROOT_PATH = os.path.dirname(os.path.dirname(__file__))

urlpatterns = patterns('',
urlpatterns = (
# Example:
# (r'^sample/', include('sample.foo.urls')),

Expand All @@ -18,18 +20,18 @@
# (r'^admin/doc/', include('django.contrib.admindocs.urls')),

# Uncomment the next line to enable the admin:
(r'^admin/', include(admin.site.urls)),
(r'^categories/', include('categories.urls')),
url(r'^admin/', include(admin.site.urls)),
url(r'^categories/', include('categories.urls')),
#(r'^cats/', include('categories.urls')),

(r'^static/categories/(?P<path>.*)$', 'django.views.static.serve',
url(r'^static/categories/(?P<path>.*)$', serve,
{'document_root': ROOT_PATH + '/categories/media/categories/'}),

# (r'^static/editor/(?P<path>.*)$', 'django.views.static.serve',
# {'document_root': ROOT_PATH + '/editor/media/editor/',
# 'show_indexes':True}),

(r'^static/(?P<path>.*)$', 'django.views.static.serve',
url(r'^static/(?P<path>.*)$', serve,
{'document_root': os.path.join(ROOT_PATH, 'example', 'static')}),

)

0 comments on commit 0a5a3ef

Please sign in to comment.