summaryrefslogtreecommitdiff
path: root/meetingtools/urls.py
diff options
context:
space:
mode:
Diffstat (limited to 'meetingtools/urls.py')
-rw-r--r--meetingtools/urls.py8
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'),