← 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: William Grant
  • Date: 2009-12-06 10:18:20 UTC
  • mto: This revision was merged to the branch mainline in revision 1353.
  • Revision ID: grantw@unimelb.edu.au-20091206101820-d1oogsihfruowjfq
Unbreak project(set) traversals.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/admin/publishing.py
40
40
@forward_route(Offering, '+projects', argc=1)
41
41
def offering_to_project(offering, name):
42
42
    return Store.of(offering).find(Project,
 
43
                                   Project.short_name == name,
43
44
                                   Project.project_set_id == ProjectSet.id,
44
45
                                   ProjectSet.offering == offering).one()
45
46
 
46
47
@forward_route(Offering, '+projectsets', argc=1)
47
48
def offering_to_projectset(offering, name):
 
49
    try:
 
50
        ps_id = int(name)
 
51
    except ValueError:
 
52
        return None
48
53
    return Store.of(offering).find(ProjectSet,
 
54
                                   ProjectSet.id == ps_id,
49
55
                                   ProjectSet.offering == offering).one()
50
56
 
51
57
@reverse_route(User)
63
69
 
64
70
@reverse_route(ProjectSet)
65
71
def projectset_url(project_set):
66
 
    return (project_set.offering, ('+projectsets', project_set.name))
 
72
    return (project_set.offering, ('+projectsets', str(project_set.id)))
67
73
 
68
74
@reverse_route(Project)
69
75
def project_url(project):
70
 
    return (project.project_set.offering, ('+projects', project.name))
 
76
    return (project.project_set.offering, ('+projects', project.short_name))