← 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-03-22 06:05:32 UTC
  • Revision ID: matt.giuca@gmail.com-20100322060532-5365361xrx9mh32v
https://launchpad.net/bugs/543936
Changed database.py get_svn_url to take a req; include the req.user.login in the Subversion URL. This allows you to check out repositories without separately supplying the IVLE URL (as Subversion won't ask for a username by default). Also removed --username= from the lecturer project view, as it's redundant now. This fixes Launchpad bug #543936.

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, semester=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)
40
45
@forward_route(Offering, '+projects', argc=1)
41
46
def offering_to_project(offering, name):
42
47
    return Store.of(offering).find(Project,
 
48
                                   Project.short_name == name,
43
49
                                   Project.project_set_id == ProjectSet.id,
44
50
                                   ProjectSet.offering == offering).one()
45
51
 
46
52
@forward_route(Offering, '+projectsets', argc=1)
47
53
def offering_to_projectset(offering, name):
 
54
    try:
 
55
        ps_id = int(name)
 
56
    except ValueError:
 
57
        return None
48
58
    return Store.of(offering).find(ProjectSet,
 
59
                                   ProjectSet.id == ps_id,
49
60
                                   ProjectSet.offering == offering).one()
50
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
 
51
69
@reverse_route(User)
52
70
def user_url(user):
53
71
    return (ROOT, '~' + user.login)
56
74
def subject_url(subject):
57
75
    return (ROOT, ('subjects', subject.short_name))
58
76
 
 
77
@reverse_route(Semester)
 
78
def semester_url(semester):
 
79
    return (ROOT, ('+semesters', semester.year, semester.semester))
 
80
 
59
81
@reverse_route(Offering)
60
82
def offering_url(offering):
61
83
    return (offering.subject, (offering.semester.year,
63
85
 
64
86
@reverse_route(ProjectSet)
65
87
def projectset_url(project_set):
66
 
    return (project_set.offering, ('+projectsets', project_set.name))
 
88
    return (project_set.offering, ('+projectsets', str(project_set.id)))
67
89
 
68
90
@reverse_route(Project)
69
91
def project_url(project):
70
 
    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))