Embargo links hidden.

[wolnelektury.git] / src / search / fields.py

diff --git a/src/search/fields.py b/src/search/fields.py
index 1dc7870..c27cce1 100755 (executable)
--- a/src/search/fields.py
+++ b/src/search/fields.py
@@ -3,8 +3,8 @@
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 from django import forms
-from django.forms.widgets import flatatt
-from django.utils.encoding import smart_unicode
+from django.forms.utils import flatatt
+from django.utils.encoding import smart_text
 from django.utils.safestring import mark_safe
 from json import dumps
 
@@ -18,9 +18,10 @@ class JQueryAutoCompleteWidget(forms.TextInput):
         return u'$(\'#%s\').autocomplete(%s).result(autocomplete_result_handler);' % (field_id, options)
 
     def render(self, name, value=None, attrs=None):
-        final_attrs = self.build_attrs(attrs, name=name)
+        final_attrs = self.build_attrs(self.attrs, attrs)
+        final_attrs["name"] = name
         if value:
-            final_attrs['value'] = smart_unicode(value)
+            final_attrs['value'] = smart_text(value)
 
         if 'id' not in self.attrs:
             final_attrs['id'] = 'id_%s' % name