← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: William Grant
  • Date: 2010-02-16 06:39:21 UTC
  • mto: This revision was merged to the branch mainline in revision 1674.
  • Revision ID: grantw@unimelb.edu.au-20100216063921-4va2ij07uk8pskjo
Use URLNameValidator in existing schemas.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ivle/webapp/admin/subject.py
35
35
import formencode
36
36
import formencode.validators
37
37
 
38
 
from ivle.webapp.base.forms import BaseFormView
 
38
from ivle.webapp.base.forms import BaseFormView, URLNameValidator
39
39
from ivle.webapp.base.plugins import ViewPlugin, MediaPlugin
40
40
from ivle.webapp.base.xhtml import XHTMLView
41
41
from ivle.webapp.errors import BadRequest
124
124
class SubjectSchema(formencode.Schema):
125
125
    short_name = formencode.All(
126
126
        SubjectShortNameUniquenessValidator(),
127
 
        formencode.validators.UnicodeString(not_empty=True))
 
127
        URLNameValidator(not_empty=True))
128
128
    name = formencode.validators.UnicodeString(not_empty=True)
129
129
    code = formencode.validators.UnicodeString(not_empty=True)
130
130
 
201
201
 
202
202
 
203
203
class SemesterSchema(formencode.Schema):
204
 
    year = formencode.validators.UnicodeString()
205
 
    semester = formencode.validators.UnicodeString()
 
204
    year = URLNameValidator()
 
205
    semester = URLNameValidator()
206
206
    state = formencode.All(
207
207
        formencode.validators.OneOf(["past", "current", "future"]),
208
208
        formencode.validators.UnicodeString())