~stephen-stewart/canonical-identity-provider/ubuntuone-account-layout

« back to all changes in this revision

Viewing changes to webui/views/account.py

  • Committer: Tarmac
  • Author(s): Michael Nelson
  • Date: 2013-04-23 15:55:43 UTC
  • mfrom: (816.1.5 no-cookies-for-login)
  • Revision ID: tarmac-20130423155543-h5pm7d4mnzh3wi6a
[r=ricardokirkner] Never 302 for the account-index '/' view.

Show diffs side-by-side

added added

removed removed

Lines of Context:
76
76
    if request.user.is_authenticated():
77
77
        resp = account_edit(request, token)
78
78
    else:
79
 
        resp = LoginView.as_view()(request, token=token)
 
79
        # We simply render LoginView's get() method as any posted
 
80
        # login data will be handled by the configured 'login' url.
 
81
        # (ie. /+login currently).
 
82
        resp = LoginView(request=request).get(request, token=token)
80
83
        # Perhaps the browser sent us the test cookie, or perhaps it
81
84
        # didn't.  We'll tell Django that we want one, and it will be
82
85
        # intelligent and not send it out again if the browser *did*