← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/webapp/admin/subject.py

Merged from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/admin/subject.py
26
26
import urllib
27
27
import cgi
28
28
 
 
29
from storm.locals import Desc
 
30
 
29
31
from ivle.webapp.base.xhtml import XHTMLView
30
32
from ivle.webapp.base.plugins import ViewPlugin, MediaPlugin
31
33
from ivle.webapp.errors import NotFound
32
 
from ivle.database import Subject
 
34
from ivle.database import Subject, Semester
33
35
from ivle import util
34
36
 
35
37
 
42
44
        return req.user is not None
43
45
 
44
46
    def populate(self, req, ctx):
45
 
        ctx['enrolments'] = req.user.active_enrolments
 
47
        ctx['semesters'] = []
 
48
        for semester in req.store.find(Semester).order_by(Desc(Semester.year),
 
49
                                                     Desc(Semester.semester)):
 
50
            enrolments = semester.enrolments.find(user=req.user)
 
51
            if enrolments.count():
 
52
                ctx['semesters'].append((semester, enrolments))
46
53
 
47
54
class Plugin(ViewPlugin, MediaPlugin):
48
55
    urls = [