← 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-07-27 04:52:14 UTC
  • Revision ID: coles.david@gmail.com-20100727045214-p32h1kc0gcv48dpr
https://launchpad.net/bugs/575765
Worksheets: Strip off whitespace from the end of exercise attempts.

This solves an issue where accidental whitespace in an attempt will cause 
"IndentationError" syntax error (which don't occur when run in console).

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/admin/publishing.py
 
1
# IVLE - Informatics Virtual Learning Environment
 
2
# Copyright (C) 2007-2009 The University of Melbourne
 
3
#
 
4
# This program is free software; you can redistribute it and/or modify
 
5
# it under the terms of the GNU General Public License as published by
 
6
# the Free Software Foundation; either version 2 of the License, or
 
7
# (at your option) any later version.
 
8
#
 
9
# This program is distributed in the hope that it will be useful,
 
10
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
11
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
12
# GNU General Public License for more details.
 
13
#
 
14
# You should have received a copy of the GNU General Public License
 
15
# along with this program; if not, write to the Free Software
 
16
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
17
 
 
18
from storm.locals import Store
 
19
 
 
20
from ivle.database import (
 
21
    Enrolment, Offering, ProjectSet, Project, Semester, Subject, User)
 
22
 
 
23
from ivle.webapp import ApplicationRoot
 
24
from ivle.webapp.publisher import ROOT
 
25
from ivle.webapp.publisher.decorators import forward_route, reverse_route
 
26
 
 
27
@forward_route(ApplicationRoot, argc=1)
 
28
def root_to_user(root, segment):
 
29
    if not segment.startswith('~'):
 
30
        return None
 
31
    return User.get_by_login(root.store, segment[1:])
 
32
 
 
33
@forward_route(ApplicationRoot, 'subjects', argc=1)
 
34
def root_to_subject(root, name):
 
35
    return root.store.find(Subject, short_name=name).one()
 
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
 
 
41
@forward_route(Subject, argc=2)
 
42
def subject_to_offering(subject, year, semester):
 
43
    return subject.offering_for_semester(year, semester)
 
44
 
 
45
@forward_route(Offering, '+projects', argc=1)
 
46
def offering_to_project(offering, name):
 
47
    return Store.of(offering).find(Project,
 
48
                                   Project.short_name == name,
 
49
                                   Project.project_set_id == ProjectSet.id,
 
50
                                   ProjectSet.offering == offering).one()
 
51
 
 
52
@forward_route(Offering, '+projectsets', argc=1)
 
53
def offering_to_projectset(offering, name):
 
54
    try:
 
55
        ps_id = int(name)
 
56
    except ValueError:
 
57
        return None
 
58
    return Store.of(offering).find(ProjectSet,
 
59
                                   ProjectSet.id == ps_id,
 
60
                                   ProjectSet.offering == offering).one()
 
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
 
 
69
@reverse_route(User)
 
70
def user_url(user):
 
71
    return (ROOT, '~' + user.login)
 
72
 
 
73
@reverse_route(Subject)
 
74
def subject_url(subject):
 
75
    return (ROOT, ('subjects', subject.short_name))
 
76
 
 
77
@reverse_route(Semester)
 
78
def semester_url(semester):
 
79
    return (ROOT, ('+semesters', semester.year, semester.semester))
 
80
 
 
81
@reverse_route(Offering)
 
82
def offering_url(offering):
 
83
    return (offering.subject, (offering.semester.year,
 
84
                               offering.semester.semester))
 
85
 
 
86
@reverse_route(ProjectSet)
 
87
def projectset_url(project_set):
 
88
    return (project_set.offering, ('+projectsets', str(project_set.id)))
 
89
 
 
90
@reverse_route(Project)
 
91
def project_url(project):
 
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))