Ticket #5917: newforms.extra.widgets.py.4.diff

File newforms.extra.widgets.py.4.diff, 2.0 KB (added by Camille Harang <mammique@…>, 8 years ago)

Good one, forgget above :-/

  • widgets.py

    old new  
    3030            self.years = range(this_year, this_year+10)
    3131
    3232    def render(self, name, value, attrs=None):
     33
     34        has_id = attrs and 'id' in attrs
     35        final_attrs = self.build_attrs(attrs, name=name)
     36
     37        def select_id(name_field):
     38            if has_id: return dict(final_attrs, id=name_field % attrs['id'])
     39            else: return None
     40
    3341        try:
    34             value = datetime.date(*map(int, value.split('-')))
     42            if isinstance(value, unicode):
     43                value = datetime.date(*map(int, value.split('-')))
    3544            year_val, month_val, day_val = value.year, value.month, value.day
    3645        except (AttributeError, TypeError, ValueError):
    3746            year_val = month_val = day_val = None
     
    4049
    4150        month_choices = MONTHS.items()
    4251        month_choices.sort()
    43         select_html = Select(choices=month_choices).render(self.month_field % name, month_val)
     52        select_html = Select(select_id(self.month_field),
     53                             choices=month_choices).render(self.month_field % name, month_val)
    4454        output.append(select_html)
    4555
    4656        day_choices = [(i, i) for i in range(1, 32)]
    47         select_html = Select(choices=day_choices).render(self.day_field % name, day_val)
     57        select_html = Select(select_id(self.month_field),
     58                             choices=day_choices).render(self.day_field % name, day_val)
    4859        output.append(select_html)
    4960
    5061        year_choices = [(i, i) for i in self.years]
    51         select_html = Select(choices=year_choices).render(self.year_field % name, year_val)
     62        select_html = Select(select_id(self.year_field),
     63                             choices=year_choices).render(self.year_field % name, year_val)
    5264        output.append(select_html)
    5365
    5466        return u'\n'.join(output)
Back to Top