Revision c700f742 snf-astakos-app/astakos/im/urls.py

b/snf-astakos-app/astakos/im/urls.py
57 57
#    url(r'^timeline/?$', 'timeline', {}, name='timeline'),
58 58

  
59 59
    url(r'^projects/add/?$', 'project_add', {}, name='project_add'),
60
    url(r'^projects/update/(?P<application_id>\w+)/?$', 'project_update', {}, name='project_update'),
60
    url(r'^projects/update/(?P<application_id>\d+)/?$', 'project_update', {}, name='project_update'),
61 61
    url(r'^projects/?$', 'project_list', {}, name='project_list'),
62 62
    url(r'^projects/search/?$', 'project_search', {}, name='project_search'),
63
    url(r'^projects/(?P<application_id>\w+)/?$', 'project_detail', {}, name='project_detail'),
64
    url(r'^projects/(?P<application_id>\w+)/join/?$', 'project_join', {}, name='project_join'),
65
    url(r'^projects/(?P<application_id>\w+)/leave/?$', 'project_leave', {}, name='project_leave'),
66
    url(r'^projects/(?P<application_id>\w+)/(?P<user_id>\d+)/accept/?$', 'project_accept_member', {}, name='project_accept_member'),
67
    url(r'^projects/(?P<application_id>\w+)/(?P<user_id>\d+)/reject/?$', 'project_reject_member', {}, name='project_reject_member'),
68
    url(r'^projects/(?P<application_id>\w+)/(?P<user_id>\d+)/remove/?$', 'project_remove_member', {}, name='project_remove_member'),
63
    url(r'^projects/(?P<application_id>\d+)/?$', 'project_detail', {}, name='project_detail'),
64
    url(r'^projects/(?P<application_id>\d+)/join/?$', 'project_join', {}, name='project_join'),
65
    url(r'^projects/(?P<application_id>\d+)/leave/?$', 'project_leave', {}, name='project_leave'),
66
    url(r'^projects/(?P<application_id>\d+)/(?P<user_id>\d+)/accept/?$', 'project_accept_member', {}, name='project_accept_member'),
67
    url(r'^projects/(?P<application_id>\d+)/(?P<user_id>\d+)/reject/?$', 'project_reject_member', {}, name='project_reject_member'),
68
    url(r'^projects/(?P<application_id>\d+)/(?P<user_id>\d+)/remove/?$', 'project_remove_member', {}, name='project_remove_member'),
69 69
    
70 70
    url(r'^projects/how_it_works/?$', 'how_it_works', {}, name='how_it_works'),
71 71
    url(r'^remove_auth_provider/(?P<pk>\d+)?$', 'remove_auth_provider', {}, name='remove_auth_provider'),
......
151 151
    url(r'^get_menu/?$', 'get_menu'))
152 152

  
153 153
urlpatterns += patterns(
154
    'astakos.im.api.admin',
155
    url(r'^authenticate/?$', 'authenticate_old'),
156
    #url(r'^authenticate/v2/?$', 'authenticate'),
157
    url(r'^admin/api/v2.0/users/?$', 'get_user_by_email'),
158
    url(r'^admin/api/v2.0/users/(?P<user_id>.+?)/?$',
159
        'get_user_by_username'))
154
    'astakos.im.api.user',
155
    url(r'^authenticate/?$', 'authenticate'))
160 156

  
161 157
urlpatterns += patterns(
162 158
    'astakos.im.api.service',
163
    #url(r'^service/api/v2.0/tokens/(?P<token_id>.+?)/?$', 'validate_token'),
164 159
    url(r'^service/api/v2.0/feedback/?$', 'send_feedback'),
165
    url(r'^service/api/v2.0/users/?$',
166
        'get_user_by_email'),
167
    url(r'^service/api/v2.0/users/(?P<user_id>.+?)/?$',
168
        'get_user_by_username'))
160
    url(r'^service/api/v2.0/users/?$', 'get_user_info'))

Also available in: Unified diff