Merge pull request #21 from plone/fix-csrf-protection-encoding

Fix csrf protection encoding
plone · Dec 1, 2015 · 75e9628 · 75e9628
2 parents 7c6f817 + 23cd9cf
commit 75e9628
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/docs/HISTORY.rst b/docs/HISTORY.rst
@@ -7,6 +7,11 @@ Changelog
 - Remove unnecessary test setup.
   [timo] 
 
+- Fix HTML entities in browse button title
+  [gaudenz]
+
+- Implement __len__ for PathSource
+  [gaudenz]
 
 1.0.11 (2015-02-09)
 -------------------

diff --git a/plone/formwidget/contenttree/source.py b/plone/formwidget/contenttree/source.py
@@ -106,6 +106,9 @@ def __init__(self, context, selectable_filter, navigation_tree_query=None, defau
     def __iter__(self):
         return iter(self._default_terms)
 
+    def __len__(self):
+        return len(self._default_terms)
+
     def __contains__(self, value):
         try:
             brain = self._getBrainByValue(value)

diff --git a/plone/formwidget/contenttree/widget.py b/plone/formwidget/contenttree/widget.py
@@ -123,13 +123,7 @@ def __call__(self):
     if ($(this).siblings('input.searchButton').length != 0) {
         return;
     }
-    var input = document.createElement('input');
-    $(input)
-        .attr({
-            'type': 'button',
-            'value': '%(button_val)s'
-        })
-        .addClass('searchButton')
+    $('<input type="button" value="%(button_val)s" class="searchButton">')
         .click(function () {
             var parent = $(this).parents("*[id$='-autocomplete']");
             var window = parent.siblings("*[id$='-contenttree-window']");