Hopiu/django-categories
1
0
Fork 0
mirror of https://github.com/jazzband/django-categories.git synced 2026-03-16 22:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Updated urls to work without patterns since patterns is being deprecated

Browse source
This commit is contained in:
Brent O'Connor 2016-02-15 11:54:25 -06:00
parent f61e6f6f36
commit 0a5a3efac5
2 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
categories/urls.py
View file

@ -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
@ -15,12 +16,12 @@ categorytree_dict = {
'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
example/urls.py
View file

@ -1,7 +1,9 @@
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()
@ -9,7 +11,7 @@ import os
ROOT_PATH = os.path.dirname(os.path.dirname(__file__))
urlpatterns = patterns('',
urlpatterns = (
# Example:
# (r'^sample/', include('sample.foo.urls')),
@ -18,18 +20,18 @@ urlpatterns = patterns('',
# (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')}),
)