Revision e3ff6830 snf-astakos-app/astakos/urls.py

b/snf-astakos-app/astakos/urls.py
32 32
# or implied, of GRNET S.A.
33 33

  
34 34
from django.conf.urls.defaults import include, patterns
35
from synnefo.lib import join_urls
36
from astakos.im.settings import (
37
    BASE_PATH, ACCOUNTS_PREFIX, VIEWS_PREFIX, KEYSTONE_PREFIX
38
)
39
from snf_django.lib.api.utils import prefix_pattern
35 40

  
36
urlpatterns = patterns(
41
astakos_patterns = patterns(
37 42
    '',
38
    (r'^im/', include('astakos.im.urls')),
39
    (r'^astakos/api/', include('astakos.api.urls')),
40
    (r'^login/?$', 'astakos.im.views.target.redirect.login')
43
    (prefix_pattern(VIEWS_PREFIX), include('astakos.im.urls')),
44
    (prefix_pattern(ACCOUNTS_PREFIX), include('astakos.api.urls')),
45
    #(prefix_pattern(KEYSTONE_PREFIX), include('astakos.api.keystone_urls')),
46
)
47

  
48
# Compatibility: expose some API URLs at top-level
49
compatibility_patterns = patterns(
50
    'astakos',
51
    (r'^login/?$', 'im.views.target.redirect.login'),
52
    (r'^feedback/?$', 'api.user.send_feedback'),
53
    (r'^user_catalogs/?$', 'api.user.get_uuid_displayname_catalogs'),
54
    (r'^service/api/user_catalogs/?$',
55
        'api.service.get_uuid_displayname_catalogs'),
41 56
)
42 57

  
43
urlpatterns += patterns(
44
    'astakos.api',
45
    (r'^feedback/?$', 'user.send_feedback'),
46
    (r'^user_catalogs/?$', 'user.get_uuid_displayname_catalogs'),
47
    (r'^service/api/user_catalogs/?$', 'service.get_uuid_displayname_catalogs')
58
astakos_patterns += compatibility_patterns
59

  
60
urlpatterns = patterns(
61
    '',
62
    (prefix_pattern(BASE_PATH), include(astakos_patterns)),
48 63
)

Also available in: Unified diff