Mercurial > piecrust2

changeset 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 58e28ba02fb7
children c71472e6537f
files piecrust/appconfigdefaults.py
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/piecrust/appconfigdefaults.py	Thu Jun 08 08:50:33 2017 -0700
+++ b/piecrust/appconfigdefaults.py	Thu Jun 08 08:51:00 2017 -0700
@@ -163,7 +163,7 @@
                 }),
                 ('categories', {
                     'term': 'category',
-                    'func_name': 'pccaturl'
+                    'func_term_name': 'cat'
                 })
             ])
         })
@@ -289,10 +289,11 @@
             (values, 'site/%s' % tax_url_cfg_name),
             default=('%s/%%%s%%' % (term, term)))
         tax_url = '/' + url_prefix + tax_url.lstrip('/')
-        tax_func_name = try_get_dict_values(
-            (site_values, 'site/taxonomies/%s/func_name' % tax_name),
-            (values, 'site/taxonomies/%s/func_name' % tax_name),
-            default=('%s%surl' % (tpl_func_prefix, term)))
+        tax_func_term_name = try_get_dict_values(
+            (site_values, 'site/taxonomies/%s/func_term_name' % tax_name),
+            (values, 'site/taxonomies/%s/func_term_name' % tax_name),
+            default=term)
+        tax_func_name = '%s%surl' % (tpl_func_prefix, tax_func_term_name)
         tax_route = collections.OrderedDict({
             'url': tax_url,
             'pass': 2,