Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote branch 'upstream/master'

  • Loading branch information...
commit 02ea338a3d7fe45f46d45bccf1f3160ac75e5bd8 2 parents a758af7 + 131a9f2
@teixas authored
Showing with 5 additions and 1 deletion.
  1. +4 −0 kotti/__init__.py
  2. +1 −1  kotti/templates/add-dropdown.pt
View
4 kotti/__init__.py
@@ -109,6 +109,10 @@ def base_configure(global_config, **settings):
for key, value in conf_defaults.items():
settings.setdefault(key, value)
+ for key, value in settings.items():
+ if isinstance(settings[key], basestring):
+ settings[key] = unicode(value, 'utf8')
+
# Allow extending packages to change 'settings' w/ Python:
_resolve_dotted(settings, keys=('kotti.configurators',))
for func in settings['kotti.configurators']:
View
2  kotti/templates/add-dropdown.pt
@@ -10,7 +10,7 @@
</a>
<ul class="dropdown-menu">
<li tal:repeat="factory factories">
- <a href="${api.url(context, factory.type_info.add_view)}">${factory.type_info.name}</a>
+ <a href="${api.url(context, factory.type_info.add_view)}">${factory.type_info.title}</a>
</li>
</ul>
</li>
Please sign in to comment.
Something went wrong with that request. Please try again.