← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/webapp/security/views.py

  • Committer: Matt Giuca
  • Date: 2009-04-28 11:19:03 UTC
  • Revision ID: matt.giuca@gmail.com-20090428111903-murkoqeljahrp2d8
usrmgt-server: Removed all references to ivle.conf. Now uses the config
    object.
    (I created a global variable, config, just for the outermost functions to
    use. All of the other functions still use an argument version of config,
    for testing purposes).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/security/views.py
101
101
                else:
102
102
                    user = None
103
103
                    try:
104
 
                        user = authenticate.authenticate(req.config, req.store,
 
104
                        user = authenticate.authenticate(req.store,
105
105
                                    username.value, password.value)
106
106
                    except AuthError, msg:
107
107
                        badlogin = msg
127
127
                                          plugin.cookies[cookie](user), path='/'))
128
128
 
129
129
                        # Add any new enrolments.
130
 
                        ivle.pulldown_subj.enrol_user(req.config, req.store, user)
 
130
                        ivle.pulldown_subj.enrol_user(req.store, user)
131
131
                        req.store.commit()
132
132
 
133
133
                        req.throw_redirect(nexturl)