Revision 73fbaec4 snf-astakos-app/astakos/im/urls.py

b/snf-astakos-app/astakos/im/urls.py
33 33

  
34 34
from django.conf.urls.defaults import patterns, url
35 35

  
36
from astakos.im.forms import (ExtendedPasswordResetForm,
37
                              ExtendedPasswordChangeForm,
38
                              ExtendedSetPasswordForm, LoginForm)
36
from astakos.im.forms import (
37
    ExtendedPasswordResetForm,
38
    ExtendedPasswordChangeForm,
39
    ExtendedSetPasswordForm, LoginForm)
39 40
from astakos.im.settings import IM_MODULES, INVITATIONS_ENABLED, EMAILCHANGE_ENABLED
40 41

  
41
urlpatterns = patterns('astakos.im.views',
42
urlpatterns = patterns(
43
    'astakos.im.views',
42 44
    url(r'^$', 'index', {}, name='index'),
43 45
    url(r'^login/?$', 'index', {}, name='login'),
44 46
    url(r'^profile/?$','edit_profile', {}, name='edit_profile'),
......
54 56
#    url(r'^billing/?$', 'billing', {}, name='billing'),
55 57
#    url(r'^timeline/?$', 'timeline', {}, name='timeline'),
56 58

  
57
    url(r'^group/add/complete/?$', 'group_add_complete', {}, name='group_add_complete'),
58
    url(r'^group/add/(?P<kind_name>\w+)?$', 'group_add', {}, name='group_add'),
59
    url(r'^group/list/?$', 'group_list', {}, name='group_list'),
60
    url(r'^group/(?P<group_id>\d+)/?$', 'group_detail', {}, name='group_detail'),
61
    url(r'^group/search/?$', 'group_search', {}, name='group_search'),
62
    url(r'^group/all/?$', 'group_all', {}, name='group_all'),
63
    url(r'^group/(?P<group_id>\d+)/join/?$', 'group_join', {}, name='group_join'),
64
    url(r'^group/(?P<group_id>\d+)/leave/?$', 'group_leave', {}, name='group_leave'),
65
    url(r'^group/(?P<group_id>\d+)/(?P<user_id>\d+)/approve/?$', 'approve_member', {}, name='approve_member'),
66
    url(r'^group/(?P<group_id>\d+)/(?P<user_id>\d+)/disapprove/?$', 'disapprove_member', {}, name='disapprove_member'),
67
    url(r'^group/create/?$', 'group_create_list', {}, name='group_create_list'),
68
    url(r'^group/how_it_works/?$', 'how_it_works', {}, name='how_it_works'),
59
#     url(r'^group/add/complete/?$', 'group_add_complete', {}, name='group_add_complete'),
60
#     url(r'^group/add/(?P<kind_name>\w+)?$', 'group_add', {}, name='group_add'),
61
#     url(r'^group/list/?$', 'group_list', {}, name='group_list'),
62
#     url(r'^group/(?P<group_id>\d+)/?$', 'group_detail', {}, name='group_detail'),
63
#     url(r'^group/search/?$', 'group_search', {}, name='group_search'),
64
#     url(r'^group/all/?$', 'group_all', {}, name='group_all'),
65
#     url(r'^group/(?P<group_id>\d+)/join/?$', 'group_join', {}, name='group_join'),
66
#     url(r'^group/(?P<group_id>\d+)/leave/?$', 'group_leave', {}, name='group_leave'),
67
#     url(r'^group/(?P<group_id>\d+)/(?P<user_id>\d+)/approve/?$', 'approve_member', {}, name='approve_member'),
68
#     url(r'^group/(?P<group_id>\d+)/(?P<user_id>\d+)/disapprove/?$', 'disapprove_member', {}, name='disapprove_member'),
69
#     url(r'^group/create/?$', 'group_create_list', {}, name='group_create_list'),
69 70
    
70 71
    url(r'^project/add/?$', 'project_add', {}, name='project_add'),
71
    url(r'^project/update/(?P<id>\w+)/?$', 'project_update', {}, name='project_update'),
72
    url(r'^project/update/(?P<application_id>\w+)/?$', 'project_update', {}, name='project_update'),
72 73
    url(r'^project/list/?$', 'project_list', {}, name='project_list'),
73 74
    url(r'^project/search/?$', 'project_search', {}, name='project_search'),
74 75
    url(r'^project/all/?$', 'project_all', {}, name='project_all'),
75
    url(r'^project/(?P<id>\w+)/?$', 'project_detail', {}, name='project_detail'),
76
    url(r'^project/(?P<id>\w+)/join/?$', 'project_join', {}, name='project_join'),
77
    url(r'^project/(?P<id>\w+)/leave/?$', 'project_leave', {}, name='project_leave'),
78
    url(r'^project/(?P<id>\w+)/(?P<user_id>\d+)/approve/?$', 'project_approve_member', {}, name='project_approve_member'),
79
    url(r'^project/(?P<id>\w+)/(?P<user_id>\d+)/reject/?$', 'project_reject_member', {}, name='project_reject_member'),
80
    url(r'^project/(?P<id>\w+)/(?P<user_id>\d+)/remove/?$', 'project_remove_member', {}, name='project_remove_member'),
76
    url(r'^project/(?P<application_id>\w+)/?$', 'project_detail', {}, name='project_detail'),
77
    url(r'^project/(?P<application_id>\w+)/join/?$', 'project_join', {}, name='project_join'),
78
    url(r'^project/(?P<application_id>\w+)/leave/?$', 'project_leave', {}, name='project_leave'),
79
    url(r'^project/(?P<application_id>\w+)/(?P<user_id>\d+)/approve/?$', 'project_approve_member', {}, name='project_approve_member'),
80
    url(r'^project/(?P<application_id>\w+)/(?P<user_id>\d+)/reject/?$', 'project_reject_member', {}, name='project_reject_member'),
81
    url(r'^project/(?P<application_id>\w+)/(?P<user_id>\d+)/remove/?$', 'project_remove_member', {}, name='project_remove_member'),
81 82
    
82 83
    url(r'^group/how_it_works/?$', 'how_it_works', {}, name='how_it_works'),
83 84
    url(r'^remove_auth_provider/(?P<pk>\d+)?$', 'remove_auth_provider', {}, name='remove_auth_provider'),
......
85 86

  
86 87

  
87 88
if EMAILCHANGE_ENABLED:
88
    urlpatterns += patterns('astakos.im.views',
89
    urlpatterns += patterns(
90
        'astakos.im.views',
89 91
        url(r'^email_change/?$', 'change_email', {}, name='email_change'),
90 92
        url(r'^email_change/confirm/(?P<activation_key>\w+)/?$', 'change_email', {},
91
            name='email_change_confirm')
92
)
93
            name='email_change_confirm'))
93 94

  
94
urlpatterns += patterns('astakos.im.target',
95
                        url(r'^login/redirect/?$', 'redirect.login')
96
                        )
95
urlpatterns += patterns(
96
    'astakos.im.target',
97
    url(r'^login/redirect/?$', 'redirect.login'))
97 98

  
98 99
if 'local' in IM_MODULES:
99
    urlpatterns += patterns('astakos.im.target',
100
    urlpatterns += patterns(
101
        'astakos.im.target',
100 102
        url(r'^local/?$', 'local.login'),
101 103
        url(r'^password_change/?$', 'local.password_change', {
102 104
            'post_change_redirect':'profile',
103 105
            'password_change_form':ExtendedPasswordChangeForm
104 106
            },
105
            name='password_change')
106
    )
107
    urlpatterns += patterns('django.contrib.auth.views',
107
            name='password_change'))
108
    urlpatterns += patterns(
109
        'django.contrib.auth.views',
108 110
        url(r'^local/password_reset/?$', 'password_reset',
109 111
         {'email_template_name':'registration/password_email.txt',
110 112
          'password_reset_form':ExtendedPasswordResetForm}),
111 113
        url(r'^local/password_reset_done/?$', 'password_reset_done'),
112 114
        url(r'^local/reset/confirm/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/?$',
113 115
         'password_reset_confirm', {'set_password_form':ExtendedSetPasswordForm}),
114
        url(r'^local/password/reset/complete/?$', 'password_reset_complete')
115
    )
116
        url(r'^local/password/reset/complete/?$', 'password_reset_complete'))
116 117

  
117 118
if INVITATIONS_ENABLED:
118
    urlpatterns += patterns('astakos.im.views',
119
                            url(r'^invite/?$', 'invite', {}, name='invite')
120
                            )
119
    urlpatterns += patterns(
120
        'astakos.im.views',
121
        url(r'^invite/?$', 'invite', {}, name='invite'))
121 122

  
122 123
if 'shibboleth' in IM_MODULES:
123
    urlpatterns += patterns('astakos.im.target',
124
    urlpatterns += patterns(
125
        'astakos.im.target',
124 126
        url(r'^login/shibboleth/?$', 'shibboleth.login'),
125
        url(r'^shibboleth/signup/(\w+)/?$', 'shibboleth.signup', {}, 'shibboleth_signup')
126
    )
127
        url(r'^shibboleth/signup/(\w+)/?$', 'shibboleth.signup', {}, 'shibboleth_signup'))
127 128

  
128 129
if 'twitter' in IM_MODULES:
129
    urlpatterns += patterns('astakos.im.target',
130
                            url(r'^login/twitter/?$', 'twitter.login'),
131
                            url(r'^login/twitter/authenticated/?$',
132
                                'twitter.authenticated'),
133
                            url(r'^twitter/signup/([\w-]+)/?$',
134
                                'twitter.signup', {}, 'twitter_signup')
135
                            )
130
    urlpatterns += patterns(
131
        'astakos.im.target',
132
        url(r'^login/twitter/?$', 'twitter.login'),
133
        url(r'^login/twitter/authenticated/?$',
134
            'twitter.authenticated'),
135
        url(r'^twitter/signup/([\w-]+)/?$',
136
            'twitter.signup', {}, 'twitter_signup'))
136 137

  
137
urlpatterns += patterns('astakos.im.api',
138
                        url(r'^get_services/?$', 'get_services'),
139
                        url(r'^get_menu/?$', 'get_menu'),
140
                        )
138
urlpatterns += patterns(
139
    'astakos.im.api',
140
    url(r'^get_services/?$', 'get_services'),
141
    url(r'^get_menu/?$', 'get_menu'))
141 142

  
142
urlpatterns += patterns('astakos.im.api.admin',
143
                        url(r'^authenticate/?$', 'authenticate_old'),
144
                        #url(r'^authenticate/v2/?$', 'authenticate'),
145
                        url(r'^admin/api/v2.0/users/?$', 'get_user_by_email'),
146
                        url(r'^admin/api/v2.0/users/(?P<user_id>.+?)/?$',
147
                            'get_user_by_username'),
148
                        )
143
urlpatterns += patterns(
144
    'astakos.im.api.admin',
145
    url(r'^authenticate/?$', 'authenticate_old'),
146
    #url(r'^authenticate/v2/?$', 'authenticate'),
147
    url(r'^admin/api/v2.0/users/?$', 'get_user_by_email'),
148
    url(r'^admin/api/v2.0/users/(?P<user_id>.+?)/?$',
149
        'get_user_by_username'))
149 150

  
150
urlpatterns += patterns('astakos.im.api.service',
151
                        #url(r'^service/api/v2.0/tokens/(?P<token_id>.+?)/?$', 'validate_token'),
152
                        url(r'^service/api/v2.0/feedback/?$', 'send_feedback'),
153
                        url(r'^service/api/v2.0/users/?$',
154
                            'get_user_by_email'),
155
                        url(r'^service/api/v2.0/users/(?P<user_id>.+?)/?$',
156
                            'get_user_by_username'),
157
                        )
151
urlpatterns += patterns(
152
    'astakos.im.api.service',
153
    #url(r'^service/api/v2.0/tokens/(?P<token_id>.+?)/?$', 'validate_token'),
154
    url(r'^service/api/v2.0/feedback/?$', 'send_feedback'),
155
    url(r'^service/api/v2.0/users/?$',
156
        'get_user_by_email'),
157
    url(r'^service/api/v2.0/users/(?P<user_id>.+?)/?$',
158
        'get_user_by_username'))

Also available in: Unified diff