Revision 8f2eb016 snf-pithos-app/pithos/api/urls.py
b/snf-pithos-app/pithos/api/urls.py | ||
---|---|---|
40 | 40 |
from snf_django.lib.api import api_endpoint_not_found |
41 | 41 |
from snf_django.utils.urls import extend_endpoint_with_slash |
42 | 42 |
from pithos.api.settings import ( |
43 |
BASE_PATH, PITHOS_PREFIX, PUBLIC_PREFIX, UI_PREFIX,
|
|
43 |
BASE_PATH, PITHOS_PREFIX, PUBLIC_PREFIX, VIEW_PREFIX,
|
|
44 | 44 |
ASTAKOS_AUTH_PROXY_PATH, ASTAKOS_AUTH_URL, |
45 | 45 |
ASTAKOS_ACCOUNT_PROXY_PATH, ASTAKOS_ACCOUNT_URL, |
46 | 46 |
ASTAKOS_UI_PROXY_PATH, ASTAKOS_UI_URL, |
... | ... | |
65 | 65 |
|
66 | 66 |
pithos_view_patterns = patterns( |
67 | 67 |
'pithos.api.views', |
68 |
(r'^view/(?P<v_account>.+?)/(?P<v_container>.+?)/(?P<v_object>.+?)$',
|
|
69 |
'object_demux'))
|
|
68 |
(r'^(?P<v_account>.+?)/(?P<v_container>.+?)/(?P<v_object>.+?)$', |
|
69 |
'object_read'))
|
|
70 | 70 |
|
71 | 71 |
pithos_patterns = patterns( |
72 | 72 |
'', |
... | ... | |
77 | 77 |
(r'{0}(?P<v_public>.+?)/?$'.format(prefix_pattern(PUBLIC_PREFIX)), |
78 | 78 |
'pithos.api.public.public_demux'), |
79 | 79 |
(r'{0}'.format(prefix_pattern(UI_PREFIX)), |
80 |
(r'{0}'.format(prefix_pattern(VIEW_PREFIX)), |
|
80 | 81 |
include(pithos_view_patterns))) |
81 | 82 |
|
82 | 83 |
urlpatterns += patterns( |
Also available in: Unified diff