← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/makeuser.py

  • Committer: William Grant
  • Date: 2010-07-28 05:06:15 UTC
  • Revision ID: grantw@unimelb.edu.au-20100728050615-uwbxn9frla3pdw8m
Encode content_type when downloading files. cjson made us write bad code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/makeuser.py
87
87
            User.id == Assessed.user_id,
88
88
            Project.id == Assessed.project_id,
89
89
            ProjectSet.id == Project.project_set_id,
90
 
            Offering.id == ProjectSet.id,
 
90
            Offering.id == ProjectSet.offering_id,
91
91
            ProjectSubmission.date_submitted == Select(
92
92
                    Max(ProjectSubmission.date_submitted),
93
93
                    ProjectSubmission.assessed_id == Assessed.id,
143
143
        offering = group.project_set.offering
144
144
        reponame = "_".join([offering.subject.short_name,
145
145
                             offering.semester.year,
146
 
                             offering.semester.semester,
 
146
                             offering.semester.url_name,
147
147
                             group.name])
148
148
 
149
149
        f.write("[%s:/]\n" % reponame.encode('utf-8'))
161
161
    # a single query, and we cache the list of viewers for each offering.
162
162
    offering_viewers_cache = {}
163
163
    for (ssn, year, sem, name, psid, pspath, gid, offeringid) in store.find(
164
 
        (Subject.short_name, Semester.year, Semester.semester,
 
164
        (Subject.short_name, Semester.year, Semester.url_name,
165
165
         ProjectGroup.name, ProjectSubmission.id, ProjectSubmission.path,
166
166
         ProjectGroup.id, Offering.id),
167
167
            Assessed.id == ProjectSubmission.assessed_id,