jan/debianmemberportfolio
1
0
Fork 1
Code Issues Pull requests Releases Wiki Activity

generate wikihomepage from name if parameter is missing

Browse source
This commit is contained in:
Jan Dittberner 2010-06-03 22:58:34 +02:00
parent 44f5ffa8c3
commit bbd6ae9017
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ddportfolioservice/controllers/ddportfolio.py
View file

@ -146,8 +146,6 @@ developer name on all bug logs)'),
('nonddemail', 'email')): ('nonddemail', 'email')):
if not tuple[0] in rp or not rp[tuple[0]]: if not tuple[0] in rp or not rp[tuple[0]]:
rp[tuple[0]] = fields[tuple[1]] rp[tuple[0]] = fields[tuple[1]]
if not 'mode' in rp or not rp['mode']:
rp['mode'] = 'html'
schema = DeveloperData() schema = DeveloperData()
try: try:
@ -158,9 +156,12 @@ developer name on all bug logs)'),
except formencode.validators.Invalid, error: except formencode.validators.Invalid, error:
c.messages = { 'errors' : error.unpack_errors() } c.messages = { 'errors' : error.unpack_errors() }
return render('/showform.mako') return render('/showform.mako')
if form_result['wikihomepage'] is None:
log.debug('generate wikihomepage from name')
form_result['wikihomepage'] = "".join(
[part.capitalize() for part in form_result['name'].split()])
data = build_urls(form_result) data = build_urls(form_result)
log.debug("data %r", data) if form_result['mode'] == 'json':
if 'mode' in rp and rp['mode'] == 'json':
response.headers['Content-Type'] = 'text/javascript' response.headers['Content-Type'] = 'text/javascript'
return simplejson.dumps( return simplejson.dumps(
dict([("%s.%s" % \ dict([("%s.%s" % \

3
ddportfolioservice/model/form.py
View file

@ -34,10 +34,11 @@ class DeveloperData(formencode.Schema):
username = formencode.validators.PlainText() username = formencode.validators.PlainText()
nonddemail = formencode.validators.Email() nonddemail = formencode.validators.Email()
aliothusername = formencode.validators.PlainText() aliothusername = formencode.validators.PlainText()
mode = formencode.validators.OneOf([u'json', u'html'], not_empty=True) mode = formencode.validators.OneOf([u'json', u'html'], if_missing=u'html')
forumsid = formencode.validators.Int(if_missing=None) forumsid = formencode.validators.Int(if_missing=None)
wikihomepage = formencode.validators.String(if_missing=None) wikihomepage = formencode.validators.String(if_missing=None)
class DDDataRequest(formencode.Schema): class DDDataRequest(formencode.Schema):
"""Validation schema for DDData request.""" """Validation schema for DDData request."""
allow_extra_fields = True allow_extra_fields = True