← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/pulldown_subj/__init__.py

  • Committer: David Coles
  • Date: 2010-07-28 10:45:53 UTC
  • mfrom: (1829 trunk)
  • mto: This revision was merged to the branch mainline in revision 1830.
  • Revision ID: coles.david@gmail.com-20100728104553-5z3nxt0l6kyfqfh5
Merge from trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/pulldown_subj/__init__.py
68
68
                              Subject.code == subject,
69
69
                              Offering.subject_id == Subject.id,
70
70
                              Semester.year == year,
71
 
                              Semester.semester == semester,
 
71
                              Semester.code == semester,
72
72
                              Offering.semester_id == Semester.id).one()
73
73
 
74
74
        # We can't find a matching offering, so we don't care about it.