Skip to content

Commit

Permalink
Fix calendar widget using id instead of key for name
Browse files Browse the repository at this point in the history
  • Loading branch information
amol- committed Jun 8, 2016
1 parent 4738464 commit 5cd675e
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 5 deletions.
10 changes: 10 additions & 0 deletions tests/test_widgets.py
Original file line number Diff line number Diff line change
Expand Up @@ -1103,3 +1103,13 @@ class SomeForm(TableForm):
pass
else:
assert False, data


class TestCalendarDateTimePicker(WidgetTest):
widget = CalendarDateTimePicker
attrs = {'css_class': 'something', 'id': 'forceddid'}
params = {'value': datetime(2016, 1, 1, 15, 30)}
expected = """<div>
<input type="text" id="forceddid" name="forceddid" class="something" value="2016-01-01 15:30" />
<input type="button" id="forceddid_trigger" class="date_field_button" value="Choose" />
</div>"""
2 changes: 1 addition & 1 deletion tw2/forms/templates/calendar.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://genshi.edgewall.org/">
<input type="text" id="${w.compound_id}" name="${w.id}" class="${w.css_class}" value="${w.strdate}" py:attrs="w.attrs"/>
<input type="text" value="${w.strdate}" py:attrs="w.attrs"/>
<input type="button" id="${w.compound_id}_trigger" class="date_field_button" value="${w.button_text}" />
</div>
2 changes: 1 addition & 1 deletion tw2/forms/templates/calendar.jinja
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div>
<input type="text" id="{{ w.compound_id }}" name="{{ w.name }}" class="{{ w.css_class or '' }}" value="{{ w.strdate or '' }}" />
<input type="text" {{ w.attrs|htmlbools|xmlattr }} value="{{ w.strdate or '' }}" />
<input type="button" id="{{ w.compound_id }}_trigger" class="date_field_button" value="{{ w.button_text }}" />
</div>
4 changes: 2 additions & 2 deletions tw2/forms/templates/calendar.kajiki
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://genshi.edgewall.org/">
<input type="text" id="${w.compound_id}" name="${w.id}" class="${w.css_class}" value="${w.strdate}" py:attrs="w.attrs"/>
<div>
<input type="text" value="${w.strdate}" py:attrs="w.attrs"/>
<input type="button" id="${w.compound_id}_trigger" class="date_field_button" value="${w.button_text}" />
</div>
3 changes: 2 additions & 1 deletion tw2/forms/templates/calendar.mak
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
<%namespace name="tw" module="tw2.core.mako_util"/>\
<div>
<input type="text" id="${w.compound_id}" name="${w.name}" class="${w.css_class or ''}" value="${w.strdate or ''}" />
<input type="text" ${tw.attrs(attrs=w.attrs)} value="${w.strdate or ''}" />
<input type="button" id="${w.compound_id}_trigger" class="date_field_button" value="${w.button_text}" />
</div>\

0 comments on commit 5cd675e

Please sign in to comment.