← 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: Matt Giuca
  • Date: 2010-02-18 03:57:33 UTC
  • Revision ID: matt.giuca@gmail.com-20100218035733-d4v0iy4hq0wbjas6
https://launchpad.net/bugs/523592
ivle.fileservice_lib.listing: Previously assumed any SVN client error meant the directory was not versioned, and silently dropped SVN metadata. Now checks the error message, and for any unexpected errors, raises the exception rather than assuming unversioned. Fixes Launchpad Bug #523592.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/admin/publishing.py
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
17
17
 
18
 
from ivle.database import Offering, ProjectSet, Project, Subject, User
 
18
from storm.locals import Store
 
19
 
 
20
from ivle.database import (
 
21
    Enrolment, Offering, ProjectSet, Project, Semester, Subject, User)
19
22
 
20
23
from ivle.webapp import ApplicationRoot
21
 
from ivle.webapp.routing import ROOT
22
 
from ivle.webapp.routing.decorators import forward_route, reverse_route
 
24
from ivle.webapp.publisher import ROOT
 
25
from ivle.webapp.publisher.decorators import forward_route, reverse_route
23
26
 
24
27
@forward_route(ApplicationRoot, argc=1)
25
28
def root_to_user(root, segment):
31
34
def root_to_subject(root, name):
32
35
    return root.store.find(Subject, short_name=name).one()
33
36
 
 
37
@forward_route(ApplicationRoot, '+semesters', argc=2)
 
38
def root_to_semester(root, year, semester):
 
39
    return root.store.find(Semester, year=year, semester=semester).one()
 
40
 
34
41
@forward_route(Subject, argc=2)
35
42
def subject_to_offering(subject, year, semester):
36
43
    return subject.offering_for_semester(year, semester)
38
45
@forward_route(Offering, '+projects', argc=1)
39
46
def offering_to_project(offering, name):
40
47
    return Store.of(offering).find(Project,
 
48
                                   Project.short_name == name,
41
49
                                   Project.project_set_id == ProjectSet.id,
42
50
                                   ProjectSet.offering == offering).one()
43
51
 
44
52
@forward_route(Offering, '+projectsets', argc=1)
45
53
def offering_to_projectset(offering, name):
 
54
    try:
 
55
        ps_id = int(name)
 
56
    except ValueError:
 
57
        return None
46
58
    return Store.of(offering).find(ProjectSet,
 
59
                                   ProjectSet.id == ps_id,
47
60
                                   ProjectSet.offering == offering).one()
48
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
 
49
69
@reverse_route(User)
50
70
def user_url(user):
51
 
    return (ROOT, '~' + user)
 
71
    return (ROOT, '~' + user.login)
52
72
 
53
73
@reverse_route(Subject)
54
74
def subject_url(subject):
55
75
    return (ROOT, ('subjects', subject.short_name))
56
76
 
 
77
@reverse_route(Semester)
 
78
def semester_url(semester):
 
79
    return (ROOT, ('+semesters', semester.year, semester.semester))
 
80
 
57
81
@reverse_route(Offering)
58
82
def offering_url(offering):
59
83
    return (offering.subject, (offering.semester.year,
61
85
 
62
86
@reverse_route(ProjectSet)
63
87
def projectset_url(project_set):
64
 
    return (project_set.offering, ('+projectsets', project_set.name))
 
88
    return (project_set.offering, ('+projectsets', str(project_set.id)))
65
89
 
66
90
@reverse_route(Project)
67
91
def project_url(project):
68
 
    return (project.project_set.offering, ('+projects', project.name))
 
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))