diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-23 11:07:45 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-08-23 11:07:45 +0200 |
| commit | 7924c43af9044cfd40f36bd8a84378417223d95b (patch) | |
| tree | 78197ea5c36baaff4fcc1a53580eb3d586630b39 /ishtar_common/widgets.py | |
| parent | 54b87741a26a2bd805ed32200b082ca07ee0e27d (diff) | |
| parent | 0bdaa7c90017b436b3baf026c9710a8d49c9420a (diff) | |
| download | Ishtar-7924c43af9044cfd40f36bd8a84378417223d95b.tar.bz2 Ishtar-7924c43af9044cfd40f36bd8a84378417223d95b.zip | |
Merge branch 'master' into v0.9
Conflicts:
ishtar_common/migrations/0053_auto__add_field_ishtarsiteprofile_currency.py
Diffstat (limited to 'ishtar_common/widgets.py')
| -rw-r--r-- | ishtar_common/widgets.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py index 6d9600d0c..89eead988 100644 --- a/ishtar_common/widgets.py +++ b/ishtar_common/widgets.py @@ -144,6 +144,8 @@ class JQueryDate(forms.TextInput): self.attrs['class'] = 'date-pickup' def render(self, name, value=None, attrs=None): + if value: + value = unicode(value) # very specific... if settings.COUNTRY == 'fr' and value and '/' in value: values = value.split('/') @@ -539,7 +541,9 @@ class JQueryJqGrid(forms.RadioSelect): col_names = [col_names] for col_name in col_names: field = self.associated_model - keys = col_name.split('.') + keys = col_name.split('__') + if '.' in col_name: + keys = col_name.split('.') f_name = '' for key in keys: if hasattr(field, 'rel') and field.rel: |