fix merge conflict

duncanmorris · Oct 29, 2010 · 5d9d2f3 · 5d9d2f3
2 parents 5fd4596 + 9d6e2ed
commit 5d9d2f3
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/README.rst b/README.rst
@@ -2,3 +2,4 @@
 django-googleauth
 =================
 
+Inspired by [django-googleappsauth](http://github.com/hudora/django-googleappsauth), but uses OpenID instead of OAuth.
diff --git a/googleauth/models.py b/googleauth/models.py
@@ -0,0 +1 @@
+# these aren't the models you're looking for
diff --git a/googleauth/views.py b/googleauth/views.py
@@ -70,7 +70,8 @@ def callback(request):
     auth.login(request, user)
 
     redirect = request.session.get('next', None)
-    return HttpResponseRedirect(redirect or '/')
+    redirect_default = getattr(settings, 'LOGIN_REDIRECT_URL', '/')
+    return HttpResponseRedirect(redirect or redirect_default)
 
 def logout(request):
     """ Log user out of Django application.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,3 +2,4 @@
		django-googleauth
		=================

		Inspired by [django-googleappsauth](http://github.com/hudora/django-googleappsauth), but uses OpenID instead of OAuth.