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

« back to all changes in this revision

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

  • Committer: me at id
  • Date: 2009-01-15 05:35:42 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:1159
www/apps/groups: Use User.active_enrolments rather than ivle.db.get_enrolment.
www/apps/userservice: Same as 'groups'.

Show diffs side-by-side

added added

removed removed

Lines of Context:
27
27
 
28
28
from ivle import (util, caps)
29
29
import ivle.db
 
30
from ivle.database import Enrolment, Subject, Semester, Offering
30
31
 
31
32
def handle(req):
32
33
    # Set request attributes
43
44
    # Show a group panel per enrolment
44
45
    db = ivle.db.DB()
45
46
    try:
46
 
        subjects = db.get_enrolment(req.user.login)
47
 
        # Sort by year,semester,subj_code (newer subjects first)
48
 
        # Leave all fields as strings, just in case (eg. semester='y')
49
 
        subjects.sort(key=lambda(subject):
50
 
                          (subject["year"],subject["semester"],subject["subj_code"]),
51
 
                      reverse=True)
52
 
        if len(subjects) == 0:
 
47
        enrolments = req.user.active_enrolments
 
48
        if enrolments.count() == 0:
53
49
            req.write("<p>Error: You are not currently enrolled in any subjects."
54
50
                      "</p>\n")
55
 
        for subject in subjects:
56
 
            show_subject_panel(req, db, subject['offeringid'],
57
 
                subject['subj_name'])
 
51
        for enrolment in enrolments:
 
52
            show_subject_panel(req, db, enrolment.offering.id,
 
53
                enrolment.offering.subject.name)
58
54
        if req.user.hasCap(caps.CAP_MANAGEGROUPS):
59
55
            show_groupadmin_panel(req, db)
60
56