diff options
| author | Leif Johansson <leifj@sunet.se> | 2012-10-23 12:54:51 +0200 |
|---|---|---|
| committer | Leif Johansson <leifj@sunet.se> | 2012-10-23 12:54:51 +0200 |
| commit | 850c4b95ed26a9ce63102e010f34d8e4e90515c9 (patch) | |
| tree | 5d934117146f2b545515329fd2bb3a5b99beda23 | |
| parent | d8fd541f0e07448986f5fbbbf3207f40d4e7f48d (diff) | |
urls update
| -rw-r--r-- | meetingtools/urls.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meetingtools/urls.py b/meetingtools/urls.py index 7a4ffb2..7e39f5c 100644 --- a/meetingtools/urls.py +++ b/meetingtools/urls.py @@ -8,7 +8,7 @@ from meetingtools.apps.room.feeds import RoomAtomTagFeed,RoomRSSTagField,\ admin.autodiscover() def welcome(request): - if request.user.is_authenticated(): + if not request.user.is_anonymous(): return redirect_to('/rooms') else: return redirect_to('/accounts/login') @@ -24,9 +24,9 @@ urlpatterns = patterns('', (r'^admin/', include(admin.site.urls)), (r'^static/(?P<path>.*)$','django.views.static.serve',{'document_root': STATIC_ROOT}), # Login/Logout - (r'^accounts/login?$','meetingtools.apps.auth.views.login'), - (r'^accounts/login-federated$','meetingtools.apps.auth.views.accounts_login_federated'), - (r'^accounts/logout$','meetingtools.apps.auth.views.logout'), + (r'^accounts/login/?$','meetingtools.apps.auth.views.login'), + (r'^accounts/login-federated/?$','meetingtools.apps.auth.views.accounts_login_federated'), + (r'^accounts/logout/?$','meetingtools.apps.auth.views.logout'), (r'^user/?(.*)$','meetingtools.apps.room.views.list_rooms'), (r'^crab/',crap), ('^myroom/?','meetingtools.apps.room.views.myroom'), |