Specifying merge template for merge url.
authordeyk <deyk@crossway.org>
Wed, 18 Jan 2012 21:42:41 +0000 (13:42 -0800)
committerdeyk <deyk@crossway.org>
Wed, 18 Jan 2012 21:42:41 +0000 (13:42 -0800)
cas_provider/urls.py

index 75399c0..051ad1c 100644 (file)
@@ -7,5 +7,5 @@ urlpatterns = patterns('',
                        url(r'^socialauth-login/$', socialauth_login),
                        url(r'^validate/', validate),
                        url(r'^logout/', logout),
                        url(r'^socialauth-login/$', socialauth_login),
                        url(r'^validate/', validate),
                        url(r'^logout/', logout),
-                       url(r'^merge/', login, {'merge': True})
+                       url(r'^merge/', login, {'merge': True, 'template': 'cas/merge.html'})
                        )
                        )