Revision 8fb8d0cf snf-astakos-app/astakos/im/urls.py

b/snf-astakos-app/astakos/im/urls.py
46 46
    url(r'^login/?$', 'login', {}, name='login'),
47 47
    url(r'^landing/?$', 'landing', {}, name='landing'),
48 48
    url(r'^profile/update_token?$', 'update_token', {}, name='update_token'),
49
    url(r'^profile/?$','edit_profile', {}, name='edit_profile'),
50
    url(r'^api_access/?$','api_access', {}, name='api_access'),
51
    url(r'^\.kamakirc/?$','api_access_config', {}, name='api_access_config'),
49
    url(r'^profile/?$', 'edit_profile', {}, name='edit_profile'),
50
    url(r'^api_access/?$', 'api_access', {}, name='api_access'),
51
    url(r'^\.kamakirc/?$', 'api_access_config', {}, name='api_access_config'),
52 52
    url(r'^feedback/?$', 'feedback', {}, name='feedback'),
53
    url(r'^signup/?$', 'signup', {'on_success': 'index', 'extra_context': {'login_form': LoginForm()}}, name='signup'),
54
    url(r'^logout/?$', 'logout', {'template': 'im/login.html', 'extra_context': {'login_form': LoginForm()}}, name='logout'),
53
    url(r'^signup/?$', 'signup',
54
        {
55
            'on_success': 'index',
56
            'extra_context': {'login_form': LoginForm()}}, name='signup'),
57
    url(r'^logout/?$', 'logout',
58
        {
59
            'template': 'im/login.html',
60
            'extra_context': {'login_form': LoginForm()}}, name='logout'),
55 61
    url(r'^activate/?$', 'activate', {}, name='activate'),
56 62
    url(r'^approval_terms/?$', 'approval_terms', {}, name='latest_terms'),
57 63
    url(r'^approval_terms/(?P<term_id>\d+)/?$', 'approval_terms'),
58
    url(r'^send/activation/(?P<user_id>\d+)/?$', 'send_activation', {}, name='send_activation'),
64
    url(r'^send/activation/(?P<user_id>\d+)/?$', 'send_activation', {},
65
        name='send_activation'),
59 66
    url(r'^resources/?$', 'resource_usage', {}, name='resource_usage'),
60 67

  
61 68
#    url(r'^billing/?$', 'billing', {}, name='billing'),
......
64 71
    url(r'^projects/add/?$', 'project_add', {}, name='project_add'),
65 72
    url(r'^projects/?$', 'project_list', {}, name='project_list'),
66 73
    url(r'^projects/search/?$', 'project_search', {}, name='project_search'),
67
    url(r'^projects/(?P<chain_id>\d+)/?$', 'project_detail', {}, name='project_detail'),
68
    url(r'^projects/(?P<chain_id>\d+)/join/?$', 'project_join', {}, name='project_join'),
69
    url(r'^projects/(?P<chain_id>\d+)/leave/?$', 'project_leave', {}, name='project_leave'),
70
    url(r'^projects/(?P<chain_id>\d+)/cancel/?$', 'project_cancel', {}, name='project_cancel'),
71
    url(r'^projects/(?P<chain_id>\d+)/members/?$', 'project_members', {}, name='project_members'),
72
    url(r'^projects/(?P<chain_id>\d+)/members/approved/?$', 'project_members', {'members_status_filter':1}, name='project_approved_members'),
74
    url(r'^projects/(?P<chain_id>\d+)/?$', 'project_detail', {},
75
        name='project_detail'),
76
    url(r'^projects/(?P<chain_id>\d+)/join/?$', 'project_join', {},
77
        name='project_join'),
78
    url(r'^projects/(?P<chain_id>\d+)/leave/?$', 'project_leave', {},
79
        name='project_leave'),
80
    url(r'^projects/(?P<chain_id>\d+)/cancel/?$', 'project_cancel', {},
81
        name='project_cancel'),
82
    url(r'^projects/(?P<chain_id>\d+)/members/?$', 'project_members', {},
83
        name='project_members'),
84
    url(r'^projects/(?P<chain_id>\d+)/members/approved/?$', 'project_members',
85
        {'members_status_filter': 1}, name='project_approved_members'),
73 86
    url(r'^projects/(?P<chain_id>\d+)/members/accept/?$',
74
        'project_members_action', {'action':'accept'},
87
        'project_members_action', {'action': 'accept'},
75 88
        name='project_members_accept'),
76 89
    url(r'^projects/(?P<chain_id>\d+)/members/remove/?$',
77
        'project_members_action', {'action':'remove'},
90
        'project_members_action', {'action': 'remove'},
78 91
        name='project_members_remove'),
79 92
    url(r'^projects/(?P<chain_id>\d+)/members/reject/?$',
80
        'project_members_action', {'action':'reject'},
93
        'project_members_action', {'action': 'reject'},
81 94
        name='project_members_reject'),
82
    url(r'^projects/(?P<chain_id>\d+)/members/pending/?$', 'project_members', {'members_status_filter':0}, name='project_pending_members'),
83
    url(r'^projects/(?P<chain_id>\d+)/(?P<memb_id>\d+)/accept/?$', 'project_accept_member', {}, name='project_accept_member'),
84
    url(r'^projects/(?P<chain_id>\d+)/(?P<memb_id>\d+)/reject/?$', 'project_reject_member', {}, name='project_reject_member'),
85
    url(r'^projects/(?P<chain_id>\d+)/(?P<memb_id>\d+)/remove/?$', 'project_remove_member', {}, name='project_remove_member'),
86
    url(r'^projects/app/(?P<application_id>\d+)/?$', 'project_app', {}, name='project_app'),
87
    url(r'^projects/app/(?P<application_id>\d+)/modify$', 'project_modify', {}, name='project_modify'),
88
    url(r'^projects/app/(?P<application_id>\d+)/approve$', 'project_app_approve', {}, name='project_app_approve'),
89
    url(r'^projects/app/(?P<application_id>\d+)/deny$', 'project_app_deny', {}, name='project_app_deny'),
90
    url(r'^projects/app/(?P<application_id>\d+)/dismiss$', 'project_app_dismiss', {}, name='project_app_dismiss'),
91
    url(r'^projects/app/(?P<application_id>\d+)/cancel$', 'project_app_cancel', {}, name='project_app_cancel'),
95
    url(r'^projects/(?P<chain_id>\d+)/members/pending/?$', 'project_members',
96
        {'members_status_filter': 0}, name='project_pending_members'),
97
    url(r'^projects/(?P<chain_id>\d+)/(?P<memb_id>\d+)/accept/?$',
98
        'project_accept_member', {}, name='project_accept_member'),
99
    url(r'^projects/(?P<chain_id>\d+)/(?P<memb_id>\d+)/reject/?$',
100
        'project_reject_member', {}, name='project_reject_member'),
101
    url(r'^projects/(?P<chain_id>\d+)/(?P<memb_id>\d+)/remove/?$',
102
        'project_remove_member', {}, name='project_remove_member'),
103
    url(r'^projects/app/(?P<application_id>\d+)/?$', 'project_app', {},
104
        name='project_app'),
105
    url(r'^projects/app/(?P<application_id>\d+)/modify$', 'project_modify', {},
106
        name='project_modify'),
107
    url(r'^projects/app/(?P<application_id>\d+)/approve$',
108
        'project_app_approve', {}, name='project_app_approve'),
109
    url(r'^projects/app/(?P<application_id>\d+)/deny$', 'project_app_deny', {},
110
        name='project_app_deny'),
111
    url(r'^projects/app/(?P<application_id>\d+)/dismiss$',
112
        'project_app_dismiss', {}, name='project_app_dismiss'),
113
    url(r'^projects/app/(?P<application_id>\d+)/cancel$', 'project_app_cancel',
114
        {}, name='project_app_cancel'),
92 115

  
93 116
    url(r'^projects/how_it_works/?$', 'how_it_works', {}, name='how_it_works'),
94
    url(r'^remove_auth_provider/(?P<pk>\d+)?$', 'remove_auth_provider', {}, name='remove_auth_provider'),
117
    url(r'^remove_auth_provider/(?P<pk>\d+)?$', 'remove_auth_provider', {},
118
        name='remove_auth_provider'),
95 119
)
96 120

  
97 121

  
......
99 123
    urlpatterns += patterns(
100 124
        'astakos.im.views',
101 125
        url(r'^email_change/?$', 'change_email', {}, name='email_change'),
102
        url(r'^email_change/confirm/(?P<activation_key>\w+)/?$', 'change_email', {},
126
        url(r'^email_change/confirm/(?P<activation_key>\w+)/?$',
127
            'change_email', {},
103 128
            name='email_change_confirm'))
104 129

  
105 130
if 'local' in settings.IM_MODULES:
......
107 132
        'astakos.im.views.target.local',
108 133
        url(r'^local/?$', 'login', name='local_login'),
109 134
        url(r'^password_change/?$', 'password_change', {
110
            'post_change_redirect':'profile',
111
            'password_change_form':ExtendedPasswordChangeForm},
135
            'post_change_redirect': 'profile',
136
            'password_change_form': ExtendedPasswordChangeForm},
112 137
            name='password_change'),
113 138
        url(r'^local/password_reset/done$', 'password_reset_done'),
114 139
        url(r'^local/reset/confirm/done$',
115 140
            'password_reset_confirm_done'),
116 141
        url(r'^local/password_reset/?$', 'password_reset', {
117
            'email_template_name':'registration/password_email.txt',
118
            'password_reset_form':ExtendedPasswordResetForm,
119
            'post_reset_redirect':'password_reset/done'}),
142
            'email_template_name': 'registration/password_email.txt',
143
            'password_reset_form': ExtendedPasswordResetForm,
144
            'post_reset_redirect': 'password_reset/done'}),
120 145
        url(r'^local/password_reset_done/?$', 'password_reset_done'),
121 146
        url(r'^local/reset/confirm/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/?$',
122
         'password_reset_confirm', {
123
             'set_password_form':ExtendedSetPasswordForm,
124
             'post_reset_redirect': 'done'}),
147
            'password_reset_confirm', {
148
                'set_password_form': ExtendedSetPasswordForm,
149
                'post_reset_redirect': 'done'}),
125 150
        url(r'^local/password/reset/complete/?$', 'password_reset_complete')
126 151
    )
127 152

  

Also available in: Unified diff