← Back to branch summary

~azzar1/unity/add-show-desktop-key

« back to all changes in this revision

Viewing changes to ivle/dispatch/login.py

  • Committer: me at id
  • Date: 2009-01-15 01:18:00 UTC
  • mto: This revision was merged to the branch mainline in revision 1090.
  • Revision ID: svn-v3-trunk0:2b9c9e99-6f39-0410-b283-7f802c844ae2:branches%2Fstorm:1145
Give ivle.database.User {password,account}_expired attributes, and get
ivle.dispatch.login to use them.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/dispatch/login.py
78
78
                if user is None:
79
79
                    # Must have got an error. Do not authenticate.
80
80
                    pass
81
 
                elif user.pass_expired():
 
81
                elif user.password_expired:
82
82
                    badlogin = "Your password has expired."
83
 
                elif user.acct_expired():
 
83
                elif user.account_expired:
84
84
                    badlogin = "Your account has expired."
85
85
                else:
86
86
                    # Success - Set the session and redirect to avoid POSTDATA