← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/webapp/tutorial/__init__.py

  • Committer: William Grant
  • Date: 2009-02-27 05:07:09 UTC
  • Revision ID: grantw@unimelb.edu.au-20090227050709-k16kvhyl50nzjbwm
Subject URLs now contain the short name (eg. info1) rather than the code
(eg. 600151).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/tutorial/__init__.py
76
76
        """Find the given offering by subject, year and semester."""
77
77
        self.context = req.store.find(Offering,
78
78
            Offering.subject_id == Subject.id,
79
 
            Subject.code == subject,
 
79
            Subject.short_name == subject,
80
80
            Offering.semester_id == Semester.id,
81
81
            Semester.year == year,
82
82
            Semester.semester == semester).one()
153
153
        self.context = req.store.find(DBWorksheet,
154
154
            DBWorksheet.offering_id == Offering.id,
155
155
            Offering.subject_id == Subject.id,
156
 
            Subject.code == subject,
 
156
            Subject.short_name == subject,
157
157
            Offering.semester_id == Semester.id,
158
158
            Semester.year == year,
159
159
            Semester.semester == semester,
191
191
    permission = 'view'
192
192
 
193
193
    def __init__(self, req, subject, path):
194
 
        self.context = req.store.find(Subject, code=subject).one()
 
194
        self.context = req.store.find(Subject, short_name=subject).one()
195
195
        self.path = os.path.normpath(path)
196
196
 
197
197
    def _make_filename(self, req):
200
200
            raise NotFound()
201
201
 
202
202
        subjectdir = os.path.join(ivle.conf.subjects_base,
203
 
                                  self.context.code, 'media')
 
203
                                  self.context.short_name, 'media')
204
204
        return os.path.join(subjectdir, self.path)
205
205
 
206
206
def get_worksheets(subjectfile):
399
399
            Semester.year == year,
400
400
            Semester.semester == semester,
401
401
            Offering.subject_id == Subject.id,
402
 
            Subject.code == subject
 
402
            Subject.short_name == subject
403
403
        ).one()
404
404
        
405
405
        if self.context is None:
435
435
            Semester.year == year,
436
436
            Semester.semester == semester,
437
437
            Offering.subject_id == Subject.id,
438
 
            Subject.code == subject
 
438
            Subject.short_name == subject
439
439
        ).one()
440
440
        
441
441
        self.subject = subject
468
468
            Semester.year == year,
469
469
            Semester.semester == semester,
470
470
            Offering.subject_id == Subject.id,
471
 
            Subject.code == subject
 
471
            Subject.short_name == subject
472
472
        ).one()
473
473
        
474
474
        self.subject = subject