Commit 5f5d257a authored by Rafal's avatar Rafal

new regex

parent 75d6634b
...@@ -25,7 +25,7 @@ urlpatterns = patterns('', ...@@ -25,7 +25,7 @@ urlpatterns = patterns('',
url(r'^api/', include(router.urls)), url(r'^api/', include(router.urls)),
url(r'^admin/', include(admin.site.urls)), url(r'^admin/', include(admin.site.urls)),
url(r'^api/uuid/(?P<pk>\w+)/$', hub_views.UuidBeaconViewSet.as_view()), url(r'^api/uuid/(?P<pk>\w+)/$', hub_views.UuidBeaconViewSet.as_view()),
url(r'^api/uuid/(?P<pk>\w+)/(?P<category_name>\w+)/$', hub_views.UuidBeaconViewSet.as_view()), url(r'^api/uuid/(?P<pk>[\w\-]+)/(?P<category_name>\w+)/$', hub_views.UuidBeaconViewSet.as_view()),
) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) ) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment