Merge branch 'extraparams' into pylons0.10
* extraparams: generate wikihomepage from name if parameter is missing add translations for new pattern labels add support for optional patterns support non unicode fields add new patterns for wiki and forum improve handling of missing fields accept extra fields forumsid and wikihomepage use the fixed set of dependency versions from Lenny
This commit is contained in:
commit
74ed088cf9
7 changed files with 75 additions and 32 deletions
|
@ -95,6 +95,8 @@ developer name on all bug logs)'),
|
|||
'nm' : N_('NM'),
|
||||
'db' : N_('DB'),
|
||||
'alioth' : N_('Alioth'),
|
||||
'wiki' : N_('Wiki'),
|
||||
'forum' : N_('Forum'),
|
||||
},
|
||||
'miscellaneous' : {
|
||||
'label' : N_('Miscellaneous'),
|
||||
|
@ -149,8 +151,6 @@ developer name on all bug logs)'),
|
|||
('nonddemail', 'email')):
|
||||
if not tuple[0] in rp or not rp[tuple[0]]:
|
||||
rp[tuple[0]] = fields[tuple[1]]
|
||||
if not 'mode' in rp or not rp['mode']:
|
||||
rp['mode'] = 'html'
|
||||
|
||||
schema = DeveloperData()
|
||||
try:
|
||||
|
@ -161,8 +161,12 @@ developer name on all bug logs)'),
|
|||
except formencode.validators.Invalid, error:
|
||||
c.messages = { 'errors' : error.unpack_errors() }
|
||||
return render('/showform.mako')
|
||||
data = build_urls(rp)
|
||||
if 'mode' in rp and rp['mode'] == 'json':
|
||||
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)
|
||||
if form_result['mode'] == 'json':
|
||||
response.headers['Content-Type'] = 'text/javascript'
|
||||
return simplejson.dumps(
|
||||
dict([("%s.%s" % \
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue