fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Summon the annoying banner.
[wolnelektury.git]
/
src
/
search
/
fields.py
diff --git
a/src/search/fields.py
b/src/search/fields.py
index
45d8b7e
..
1dc7870
100755
(executable)
--- a/
src/search/fields.py
+++ b/
src/search/fields.py
@@
-22,7
+22,7
@@
class JQueryAutoCompleteWidget(forms.TextInput):
if value:
final_attrs['value'] = smart_unicode(value)
if value:
final_attrs['value'] = smart_unicode(value)
- if
not self.attrs.has_key('id')
:
+ if
'id' not in self.attrs
:
final_attrs['id'] = 'id_%s' % name
html = u'''<input type="text" %(attrs)s/>
final_attrs['id'] = 'id_%s' % name
html = u'''<input type="text" %(attrs)s/>
@@
-30,7
+30,7
@@
class JQueryAutoCompleteWidget(forms.TextInput):
%(js)s//--></script>
''' % {
'attrs': flatatt(final_attrs),
%(js)s//--></script>
''' % {
'attrs': flatatt(final_attrs),
- 'js'
: self.render_js(final_attrs['id'], self.options),
+ 'js': self.render_js(final_attrs['id'], self.options),
}
return mark_safe(html)
}
return mark_safe(html)
@@
-42,10
+42,12
@@
class JQueryAutoCompleteSearchWidget(JQueryAutoCompleteWidget):
def render_js(self, field_id, options):
return u""
def render_js(self, field_id, options):
return u""
-
+
class JQueryAutoCompleteField(forms.CharField):
class JQueryAutoCompleteField(forms.CharField):
- def __init__(self, source, options={}, *args, **kwargs):
+ def __init__(self, source, options=None, *args, **kwargs):
+ if options is None:
+ options = {}
if 'widget' not in kwargs:
options['source'] = source
kwargs['widget'] = JQueryAutoCompleteWidget(options)
if 'widget' not in kwargs:
options['source'] = source
kwargs['widget'] = JQueryAutoCompleteWidget(options)
@@
-54,7
+56,9
@@
class JQueryAutoCompleteField(forms.CharField):
class JQueryAutoCompleteSearchField(forms.CharField):
class JQueryAutoCompleteSearchField(forms.CharField):
- def __init__(self, options={}, *args, **kwargs):
+ def __init__(self, options=None, *args, **kwargs):
+ if options is None:
+ options = {}
if 'widget' not in kwargs:
kwargs['widget'] = JQueryAutoCompleteSearchWidget(options)
if 'widget' not in kwargs:
kwargs['widget'] = JQueryAutoCompleteSearchWidget(options)