diff options
| author | Leif Johansson <leifj@sunet.se> | 2011-08-16 13:30:51 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2011-08-16 13:30:51 +0200 |
| commit | 2ad60725b712e1fcea5c79bb085edb7c89f38a19 (patch) | |
| tree | 659084b604880f0afde0fa01186724b6728f68b5 /coip/urls.py | |
| parent | e3618b195de9ad343dc89a98d58c0af5aff50d97 (diff) | |
switch back to profile but more stdnewprofiles
Diffstat (limited to 'coip/urls.py')
| -rw-r--r-- | coip/urls.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/coip/urls.py b/coip/urls.py index 13c422f..ace059e 100644 --- a/coip/urls.py +++ b/coip/urls.py @@ -24,12 +24,12 @@ urlpatterns = patterns('', (r'^accounts/login-federated/$', 'coip.apps.auth.views.accounts_login_federated'), (r'^accounts/logout/$', 'coip.apps.auth.views.logout'), # Profiles and user information - #(r'^user/merge/(?P<pkey>.+)$', 'coip.apps.userprofile.views.merge'), - #(r'^user/merge$', 'coip.apps.userprofile.views.merge'), - (r'^user/home$', 'coip.apps.userprofile.views.home'), + #(r'^user/merge/(?P<pkey>.+)$', 'coip.apps.user.views.merge'), + #(r'^user/merge$', 'coip.apps.user.views.merge'), + (r'^user/home$', 'coip.apps.user.views.home'), (r'^user/(.+)/groups.json$', 'coip.apps.name.views.user_groups'), - (r'^user/search.json$', 'coip.apps.userprofile.views.search'), - (r'^user/info/(.+).json$', 'coip.apps.userprofile.views.info'), + (r'^user/search.json$', 'coip.apps.user.views.search'), + (r'^user/info/(.+).json$', 'coip.apps.user.views.info'), # Invitations (r'^name/(?P<id>[0-9]+)/invite$', 'coip.apps.invitation.views.invite'), (r'^invitation/(?P<id>[0-9]+)/cancel$', 'coip.apps.invitation.views.cancel'), |