← 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

Merge enforce-naming-constraints. Users, subjects, semesters, projects, groups exercises and worksheets now have restricted name character sets.

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
125
125
class SubjectSchema(formencode.Schema):
126
126
    short_name = formencode.All(
127
127
        SubjectShortNameUniquenessValidator(),
128
 
        formencode.validators.UnicodeString(not_empty=True))
 
128
        URLNameValidator(not_empty=True))
129
129
    name = formencode.validators.UnicodeString(not_empty=True)
130
130
    code = formencode.validators.UnicodeString(not_empty=True)
131
131
 
202
202
 
203
203
 
204
204
class SemesterSchema(formencode.Schema):
205
 
    year = formencode.validators.UnicodeString()
206
 
    semester = formencode.validators.UnicodeString()
 
205
    year = URLNameValidator()
 
206
    semester = URLNameValidator()
207
207
    state = formencode.All(
208
208
        formencode.validators.OneOf(["past", "current", "future"]),
209
209
        formencode.validators.UnicodeString())