← Back to branch summary

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

« back to all changes in this revision

Viewing changes to www/apps/userservice/__init__.py

  • Committer: William Grant
  • Date: 2009-01-20 01:02:29 UTC
  • mto: This revision was merged to the branch mainline in revision 1090.
  • Revision ID: grantw@unimelb.edu.au-20090120010229-592qbjx4q13jc4ue
www/apps/userservice: create_user now creates and enrols the User itself, not
    using ivle.makeuser.create_user_db.

ivle.makeuser.create_user_db: Kill. Unused.

Show diffs side-by-side

added added

removed removed

Lines of Context:
www/apps/userservice/__init__.py
149
149
import ivle.makeuser
150
150
from ivle import (util, chat, caps)
151
151
from ivle.conf import (usrmgt_host, usrmgt_port, usrmgt_magic)
 
152
import ivle.pulldown_subj
152
153
 
153
154
from ivle.auth import AuthError, authenticate
154
155
import urllib
325
326
        else:
326
327
            pass
327
328
 
328
 
    ivle.makeuser.make_user_db(**create)
329
 
    unixid = ivle.database.User.get_by_login(req.store,create['login']).unixid
 
329
    user = ivle.database.User(**create)
 
330
    req.store.add(user)
 
331
    ivle.pulldown_subj.enrol_user(req.store, user)
 
332
    req.store.commit()
330
333
 
331
334
    req.content_type = "text/plain"
332
 
    req.write(str(unixid))
 
335
    req.write(str(user.unixid))
333
336
 
334
337
update_user_fields_anyone = [
335
338
    'password', 'nick', 'email'