← Back to branch summary

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

« back to all changes in this revision

Viewing changes to bin/ivle-enrol

  • Committer: me at id
  • Date: 2009-02-02 04:42:36 UTC
  • Revision ID: svn-v4:2b9c9e99-6f39-0410-b283-7f802c844ae2:trunk:1190
www/apps/userservice#get_user: Fix fallout from the Storm migration.
    ivle.auth.authenticate.authenticate now wants a store, so we give it one.
    We also perform the old password check before we set attributes on the
    user, as otherwise the new password will always succeed (as the hash has
    already been updated).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bin/ivle-enrol
25
25
import os
26
26
import sys
27
27
 
28
 
from ivle.config import Config
29
 
from ivle.database import get_store, Subject, Semester, Offering, User
 
28
from ivle.database import get_store, Subject, Semester, Offering, User, \
 
29
                          AlreadyEnrolledError
30
30
 
31
31
def die(error):
32
32
    print >> sys.stderr, '%s: %s' % (os.path.basename(sys.argv[0]), error)
33
33
    sys.exit(1)
34
34
 
35
 
if len(sys.argv) not in (5, 6):
36
 
    print >> sys.stderr, '''usage: %s <login> <subjectcode> <year> <semester> [role]
37
 
 
38
 
'role' should be one of student (the default), tutor or lecturer.
39
 
If an enrolment already exists, it will be reactivated and its role set.''' \
 
35
if len(sys.argv) != 5:
 
36
    print >> sys.stderr, "usage: %s <login> <subjectcode> <year> <semester>" \
40
37
                         % os.path.basename(sys.argv[0])
41
38
    sys.exit()
42
39
 
43
 
store = get_store(Config())
 
40
store = get_store()
44
41
 
45
42
user = User.get_by_login(store, sys.argv[1])
46
43
if user is None:
55
52
if not offering:
56
53
    die("subject offering not found")
57
54
 
58
 
role = unicode(sys.argv[5]) if len(sys.argv) == 6 else u'student'
59
 
 
 
55
if not offering.semester.active:
 
56
    die("cannot enrol - semester inactive")
 
57
    
60
58
try:
61
 
    offering.enrol(user, role)
 
59
    offering.enrol(user)
62
60
except AlreadyEnrolledError:
63
61
    die("already enrolled")
64
62