Mercurial > piecrust2

comparison piecrust/appconfigdefaults.py @ 859:86994e076be4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
config: Better generate route function names to prevent collisions.
author Ludovic Chabant <ludovic@chabant.com>
date Thu, 08 Jun 2017 08:51:00 -0700
parents 4850f8c21b6e
children 504ddb370df8
comparison
equal deleted inserted replaced
858:58e28ba02fb7 859:86994e076be4
161 'multiple': True, 161 'multiple': True,
162 'term': 'tag' 162 'term': 'tag'
163 }), 163 }),
164 ('categories', { 164 ('categories', {
165 'term': 'category', 165 'term': 'category',
166 'func_name': 'pccaturl' 166 'func_term_name': 'cat'
167 }) 167 })
168 ]) 168 ])
169 }) 169 })
170 }) 170 })
171 171
287 (blog_cfg, tax_url_cfg_name), 287 (blog_cfg, tax_url_cfg_name),
288 (site_values, 'site/%s' % tax_url_cfg_name), 288 (site_values, 'site/%s' % tax_url_cfg_name),
289 (values, 'site/%s' % tax_url_cfg_name), 289 (values, 'site/%s' % tax_url_cfg_name),
290 default=('%s/%%%s%%' % (term, term))) 290 default=('%s/%%%s%%' % (term, term)))
291 tax_url = '/' + url_prefix + tax_url.lstrip('/') 291 tax_url = '/' + url_prefix + tax_url.lstrip('/')
292 tax_func_name = try_get_dict_values( 292 tax_func_term_name = try_get_dict_values(
293 (site_values, 'site/taxonomies/%s/func_name' % tax_name), 293 (site_values, 'site/taxonomies/%s/func_term_name' % tax_name),
294 (values, 'site/taxonomies/%s/func_name' % tax_name), 294 (values, 'site/taxonomies/%s/func_term_name' % tax_name),
295 default=('%s%surl' % (tpl_func_prefix, term))) 295 default=term)
296 tax_func_name = '%s%surl' % (tpl_func_prefix, tax_func_term_name)
296 tax_route = collections.OrderedDict({ 297 tax_route = collections.OrderedDict({
297 'url': tax_url, 298 'url': tax_url,
298 'pass': 2, 299 'pass': 2,
299 'source': tax_src_name, 300 'source': tax_src_name,
300 'func': tax_func_name 301 'func': tax_func_name