Skip to content

Commit

Permalink
Merge branch 'feature/date-tag' of https://github.com/dannymidnight/p…
Browse files Browse the repository at this point in the history
…yramid_simpleform into dannymidnight-feature/date-tag
  • Loading branch information
lambacck committed May 17, 2015
2 parents 38eb539 + 56f3cb8 commit c9fc7d9
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 1 deletion.
17 changes: 16 additions & 1 deletion pyramid_simpleform/renderers.py
@@ -1,4 +1,4 @@

import datetime
from webhelpers.html import tags
from webhelpers.html.builder import HTML

Expand Down Expand Up @@ -35,6 +35,21 @@ def text(self, name, value=None, id=None, **attrs):
**attrs
)

def date(self, name, value=None, id=None, date_format=None, **attrs):
"""
Outputs text input with an optionally formatted datetime.
"""
value = self.value(name, value)
if isinstance(value, datetime.date) and date_format:
value = value.strftime(date_format)

return tags.text(
name,
value,
self._get_id(id, name),
**attrs
)

def file(self, name, value=None, id=None, **attrs):
"""
Outputs file input.
Expand Down
13 changes: 13 additions & 0 deletions pyramid_simpleform/tests.py
Expand Up @@ -558,6 +558,19 @@ def test_text(self):
self.assert_(renderer.text("name") == \
'<input id="name" name="name" type="text" value="Fred" />')

def test_date(self):
from pyramid_simpleform import Form
from pyramid_simpleform.renderers import FormRenderer
import datetime

request = testing.DummyRequest()
form = Form(request, SimpleFESchema, defaults={
"when" : datetime.date(2014, 02, 01) })
renderer = FormRenderer(form)

self.assert_(renderer.date("when", date_format="%d/%m/%Y") == \
'<input id="when" name="when" type="text" value="01/02/2014" />')

def test_textarea(self):
from pyramid_simpleform import Form
from pyramid_simpleform.renderers import FormRenderer
Expand Down

0 comments on commit c9fc7d9

Please sign in to comment.