diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-11 17:04:46 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-11 17:04:46 +0100 |
| commit | d0b7f4bf65c4160eea121f00c527c5e0814856cb (patch) | |
| tree | 3afc384d9e4f0f1048408d4b8259233c3a17a722 /ishtar_common | |
| parent | 7f05372f1ed417d7a34a8be0b720a154c7ea2450 (diff) | |
| parent | 1dd01f8e15e81153e9e68b97de097798faa55133 (diff) | |
| download | Ishtar-d0b7f4bf65c4160eea121f00c527c5e0814856cb.tar.bz2 Ishtar-d0b7f4bf65c4160eea121f00c527c5e0814856cb.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/templatetags/window_field.py | 3 | ||||
| -rw-r--r-- | ishtar_common/widgets.py | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/ishtar_common/templatetags/window_field.py b/ishtar_common/templatetags/window_field.py index 2a58d844a..5180955d8 100644 --- a/ishtar_common/templatetags/window_field.py +++ b/ishtar_common/templatetags/window_field.py @@ -9,6 +9,9 @@ register = template.Library() def field(caption, data, pre_data='', post_data='', li=False): if data in (True, False): data = _(unicode(data)) + # fix bad conversion + if data == 'None': + data = "" return {'caption': caption, 'data': data, "pre_data": pre_data, 'post_data': post_data, 'li': li} diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py index ddbfa91bf..020eca5af 100644 --- a/ishtar_common/widgets.py +++ b/ishtar_common/widgets.py @@ -61,6 +61,7 @@ class Select2Multiple(forms.SelectMultiple): return super(Select2Multiple, self).render(name, value, attrs, choices) + class CheckboxSelectMultiple(CheckboxSelectMultipleBase): """ Fix initialization bug. |