Changeset 2844

Show
Ignore:
Timestamp:
04/06/07 07:34:33 (2 years ago)
Author:
alberto
Message:

merged 2842:2843 from 1.0

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/CHANGELOG.txt

    r2842 r2844  
    3737*Fixes* 
    3838 
     39* SelectionField now properly renders complex values. #1314 by rick446 
    3940* using base64.decodestring in visitor.py for 2.3 compatibility. #1279 by pnfisher. 
    4041* Config file in quickstarted app now has config option to load identity classes. Thanks to Felix 

  • trunk/turbogears/widgets/forms.py

    r2785 r2844  
    858858                if self._is_option_selected(option[0], d['value']): 
    859859                        option_attrs[self._selected_verb] = self._selected_verb 
    860                 optlist[i] = (option[0], option[1], option_attrs) 
     860                if self._multiple_selection: 
     861                    optlist[i] = (self.validator.from_python(option[0])[0], option[1], option_attrs) 
     862                else: 
     863                    optlist[i] = (self.validator.from_python(option[0]), option[1], option_attrs) 
    861864            options.extend(optlist) 
    862865            if group: