Revision 56a76611 snf-cyclades-app/synnefo/app_settings/urls.py

b/snf-cyclades-app/synnefo/app_settings/urls.py
36 36
from snf_django.lib.api.proxy import proxy
37 37
from snf_django.lib.api.utils import prefix_pattern
38 38
from snf_django.utils.urls import extend_with_root_redirects
39
from snf_django.lib.api.urls import api_patterns
39 40
from synnefo.cyclades_settings import (
40 41
    BASE_URL, BASE_HOST, BASE_PATH, COMPUTE_PREFIX, VMAPI_PREFIX,
41 42
    PLANKTON_PREFIX, HELPDESK_PREFIX, UI_PREFIX, ASTAKOS_BASE_URL,
......
50 51
astakos_proxy = partial(proxy, proxy_base=BASE_ASTAKOS_PROXY_PATH,
51 52
                        target_base=ASTAKOS_BASE_URL)
52 53

  
53
cyclades_patterns = patterns('',
54
    (prefix_pattern(UI_PREFIX), include('synnefo.ui.urls')),
54
cyclades_patterns = api_patterns('',
55 55
    (prefix_pattern(VMAPI_PREFIX), include('synnefo.vmapi.urls')),
56 56
    (prefix_pattern(PLANKTON_PREFIX), include('synnefo.plankton.urls')),
57
    (prefix_pattern(HELPDESK_PREFIX), include('synnefo.helpdesk.urls')),
58 57
    (prefix_pattern(COMPUTE_PREFIX), include('synnefo.api.urls')),
59 58
    (prefix_pattern(USERDATA_PREFIX), include('synnefo.userdata.urls')),
60 59
)
61 60

  
61
cyclades_patterns += patterns('',
62
    (prefix_pattern(UI_PREFIX), include('synnefo.ui.urls')),
63
    (prefix_pattern(HELPDESK_PREFIX), include('synnefo.helpdesk.urls')),
64
)
65

  
62 66
urlpatterns = patterns(
63 67
    '',
64 68
    (prefix_pattern(BASE_PATH), include(cyclades_patterns)),
......
68 72
    astakos_proxy = partial(proxy, proxy_base=BASE_ASTAKOS_PROXY_PATH,
69 73
                            target_base=ASTAKOS_BASE_URL)
70 74

  
71
    proxy_patterns = patterns(
75
    proxy_patterns = patterns('', 
76
        (prefix_pattern(ASTAKOS_VIEWS_PREFIX), astakos_proxy),
77
    )
78
    proxy_patterns += api_patterns(
72 79
        '',
73 80
        (r'^login/?$', astakos_proxy),
74 81
        (r'^feedback/?$', astakos_proxy),
75 82
        (r'^user_catalogs/?$', astakos_proxy),
76
        (prefix_pattern(ASTAKOS_VIEWS_PREFIX), astakos_proxy),
77 83
        (prefix_pattern(ASTAKOS_ACCOUNTS_PREFIX), astakos_proxy),
78 84
    )
79 85

  

Also available in: Unified diff