← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/webapp/tutorial/service.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/service.py
56
56
            WorksheetExercise.worksheet_id == Worksheet.id,
57
57
            Worksheet.offering_id == Offering.id,
58
58
            Offering.subject_id == Subject.id,
59
 
            Subject.code == subject,
 
59
            Subject.short_name == subject,
60
60
            Offering.semester_id == Semester.id,
61
61
            Semester.year == year,
62
62
            Semester.semester == semester).one()
151
151
            Worksheet.identifier == worksheet,
152
152
            Worksheet.offering_id == Offering.id,
153
153
            Offering.subject_id == Subject.id,
154
 
            Subject.code == subject,
 
154
            Subject.short_name == subject,
155
155
            Offering.semester_id == Semester.id,
156
156
            Semester.year == year,
157
157
            Semester.semester == semester).one()
179
179
            WorksheetExercise.worksheet_id == Worksheet.id,
180
180
            Worksheet.offering_id == Offering.id,
181
181
            Offering.subject_id == Subject.id,
182
 
            Subject.code == subject,
 
182
            Subject.short_name == subject,
183
183
            Offering.semester_id == Semester.id,
184
184
            Semester.year == year,
185
185
            Semester.semester == semester).one()
228
228
            Worksheet.identifier == self.worksheet,
229
229
            Worksheet.offering_id == Offering.id,
230
230
            Offering.subject_id == Subject.id,
231
 
            Subject.code == self.subject,
 
231
            Subject.short_name == self.subject,
232
232
            Offering.semester_id == Semester.id,
233
233
            Semester.year == self.year,
234
234
            Semester.semester == self.semester).one()
258
258
    
259
259
        self.context = req.store.find(Offering,
260
260
            Offering.subject_id == Subject.id,
261
 
            Subject.code == self.subject,
 
261
            Subject.short_name == self.subject,
262
262
            Offering.semester_id == Semester.id,
263
263
            Semester.year == self.year,
264
264
            Semester.semester == self.semester).one()