← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ivle/webapp/admin/publishing.py

  • Committer: David Coles
  • Date: 2010-08-30 03:26:13 UTC
  • Revision ID: coles.david@gmail.com-20100830032613-d14vng0jkelniu3l
python-console: Fix globals broken with new JSON library.

simplejson always returns unicode strings. cJSON would return ordinary strings 
if possible. cPickle.loads() only accepts strings. At present we use pickle 
version 0 so they should all works as ASCII strings. Higher versions of pickle 
are not plain ASCII and are likely to break this and so this should be fixed 
at some point.

Also replaced unconditional exception with one that catches Pickle errors. Not 
sure the best way to report failures of these functions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/admin/publishing.py
17
17
 
18
18
from storm.locals import Store
19
19
 
20
 
from ivle.database import Offering, ProjectSet, Project, Subject, User
 
20
from ivle.database import (
 
21
    Enrolment, Offering, ProjectSet, Project, Semester, Subject, User)
21
22
 
22
23
from ivle.webapp import ApplicationRoot
23
24
from ivle.webapp.publisher import ROOT
33
34
def root_to_subject(root, name):
34
35
    return root.store.find(Subject, short_name=name).one()
35
36
 
 
37
@forward_route(ApplicationRoot, '+semesters', argc=2)
 
38
def root_to_semester(root, year, semester):
 
39
    return root.store.find(Semester, year=year, url_name=semester).one()
 
40
 
36
41
@forward_route(Subject, argc=2)
37
42
def subject_to_offering(subject, year, semester):
38
43
    return subject.offering_for_semester(year, semester)
54
59
                                   ProjectSet.id == ps_id,
55
60
                                   ProjectSet.offering == offering).one()
56
61
 
 
62
@forward_route(Offering, '+enrolments', argc=1)
 
63
def offering_to_enrolment(offering, login):
 
64
    return Store.of(offering).find(Enrolment,
 
65
                                   Enrolment.offering == offering,
 
66
                                   Enrolment.user_id == User.id,
 
67
                                   User.login == login).one()
 
68
 
57
69
@reverse_route(User)
58
70
def user_url(user):
59
71
    return (ROOT, '~' + user.login)
62
74
def subject_url(subject):
63
75
    return (ROOT, ('subjects', subject.short_name))
64
76
 
 
77
@reverse_route(Semester)
 
78
def semester_url(semester):
 
79
    return (ROOT, ('+semesters', semester.year, semester.url_name))
 
80
 
65
81
@reverse_route(Offering)
66
82
def offering_url(offering):
67
83
    return (offering.subject, (offering.semester.year,
68
 
                               offering.semester.semester))
 
84
                               offering.semester.url_name))
69
85
 
70
86
@reverse_route(ProjectSet)
71
87
def projectset_url(project_set):
74
90
@reverse_route(Project)
75
91
def project_url(project):
76
92
    return (project.project_set.offering, ('+projects', project.short_name))
 
93
 
 
94
@reverse_route(Enrolment)
 
95
def enrolment_url(enrolment):
 
96
    return (enrolment.offering, ('+enrolments', enrolment.user.login))