Commit bcf8d99d by Kevin McDermott

Fix to work with Django 1.3.0 and 1.3.1.

parents cf027c81 691ecea9
......@@ -27,6 +27,7 @@
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
import django
from django.conf import settings
from django.contrib import admin
from django_openid_auth.models import Nonce, Association, UserOpenID
......@@ -86,4 +87,7 @@ if getattr(settings, 'OPENID_USE_AS_ADMIN_LOGIN', False):
settings.LOGIN_URL + "?next=" + request.get_full_path())
# Overide the standard admin login form.
admin.sites.AdminSite.display_login_form = _openid_login
if django.VERSION < (1, 3, 1, 'final'):
admin.sites.AdminSite.login = _openid_login
else:
admin.sites.AdminSite.display_login_form = _openid_login
......@@ -31,10 +31,12 @@ Tests for the django_openid_auth Admin login form replacement.
import os
import unittest
import django
from django.conf import settings
from django.contrib.auth.models import User, AnonymousUser
settings.OPENID_USE_AS_ADMIN_LOGIN = True
from django_openid_auth import admin
......
......@@ -41,5 +41,5 @@ urlpatterns = patterns('',
(r'^logout/$', 'django.contrib.auth.views.logout'),
(r'^private/$', views.require_authentication),
(r'^admin/(.*)', admin.site.root),
(r'^admin/', include(admin.site.urls)),
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment