diff options
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:  | 
