← 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

  • Committer: Matt Giuca
  • Date: 2010-02-25 06:10:59 UTC
  • mfrom: (1721 trunk)
  • mto: This revision was merged to the branch mainline in revision 1731.
  • Revision ID: matt.giuca@gmail.com-20100225061059-qkt9qcvsvjyepdp8
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/admin/subject.py
31
31
from storm.locals import Desc, Store
32
32
import genshi
33
33
from genshi.filters import HTMLFormFiller
34
 
from genshi.template import Context, TemplateLoader
 
34
from genshi.template import Context
35
35
import formencode
36
36
import formencode.validators
37
37
 
693
693
 
694
694
        #Open the projectset Fragment, and render it for inclusion
695
695
        #into the ProjectSets page
696
 
        #XXX: This could be a lot cleaner
697
 
        loader = genshi.template.TemplateLoader(".", auto_reload=True)
698
 
 
699
696
        set_fragment = os.path.join(os.path.dirname(__file__),
700
697
                "templates/projectset_fragment.html")
701
698
        project_fragment = os.path.join(os.path.dirname(__file__),
702
699
                "templates/project_fragment.html")
703
700
 
704
 
        for projectset in self.context.project_sets:
705
 
            settmpl = loader.load(set_fragment)
 
701
        for projectset in \
 
702
            self.context.project_sets.order_by(ivle.database.ProjectSet.id):
 
703
            settmpl = self._loader.load(set_fragment)
706
704
            setCtx = Context()
707
705
            setCtx['req'] = req
708
706
            setCtx['projectset'] = projectset
711
709
            setCtx['ProjectSetEdit'] = ProjectSetEdit
712
710
            setCtx['ProjectSetRESTView'] = ProjectSetRESTView
713
711
 
714
 
            for project in projectset.projects:
715
 
                projecttmpl = loader.load(project_fragment)
 
712
            for project in \
 
713
                projectset.projects.order_by(ivle.database.Project.deadline):
 
714
                projecttmpl = self._loader.load(project_fragment)
716
715
                projectCtx = Context()
717
716
                projectCtx['req'] = req
718
717
                projectCtx['project'] = project
753
752
        ctx['req'] = req
754
753
        ctx['GroupsView'] = GroupsView
755
754
        ctx['EnrolView'] = EnrolView
 
755
        ctx['format_datetime'] = ivle.date.make_date_nice
756
756
        ctx['format_datetime_short'] = ivle.date.format_datetime_for_paragraph
757
757
        ctx['build_subversion_url'] = self.build_subversion_url
758
758
        ctx['svn_addr'] = req.config['urls']['svn_addr']