← Back to branch summary

~twom/django-openid-auth/django-1.9-urls

« back to all changes in this revision

Viewing changes to django_openid_auth/admin.py

  • Committer: anthony.lenton at canonical
  • Date: 2012-08-29 14:37:47 UTC
  • mfrom: (88.2.3 django-1.3-fixes)
  • Revision ID: anthony.lenton@canonical.com-20120829143747-vhp3oy82yrpd6s01
[r=jamesh] Small changes to make it work with django-1.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
django_openid_auth/admin.py
77
77
    def _openid_login(self, request, error_message='', extra_context=None):
78
78
        if request.user.is_authenticated():
79
79
            if not request.user.is_staff:
80
 
                return views.render_failure(
 
80
                return views.default_render_failure(
81
81
                    request, "User %s does not have admin access."
82
82
                    % request.user.username)
83
 
            return views.render_failure(
84
 
                request, "Unknown Error: %s" % error_message)
 
83
            assert error_message, "Unknown Error: %s" % error_message
85
84
        else:
86
85
            # Redirect to openid login path,
87
86
            return HttpResponseRedirect(
88
87
                settings.LOGIN_URL + "?next=" + request.get_full_path())
89
88
 
90
89
    # Overide the standard admin login form.
91
 
    admin.sites.AdminSite.display_login_form = _openid_login
 
90
    admin.sites.AdminSite.login = _openid_login