Attached same solution, but more clean and applied on all places,
where this error can principally occur.
PaRez
Paul Reznicek wrote:
Hi Matt,
Attached patch corrects an error when using field Integer(immutable=True)
and form re-render because some validation failed (i.e. other required
field is empty, etc.)
Additionally, I've added some line breaks for the renderer to
make the produced HTML more readable (I needed it while debugging).
Thanks for the great package!
Paul
Index: widget.py
===================================================================
--- widget.py (Revision 147)
+++ widget.py (Arbeitskopie)
@@ -16,6 +16,13 @@
# Marker object for args that are not supplied
_UNSET = object()
+def _getValue4key(args, key):
+ # this correct an error when using field Integer(immutable=True)
+ # and form re-render because some validation failed
+ value = args.get(key, [''])
+ if type(value) in (list, tuple):
+ return value[0]
+ return value
class TextInput(object):
"""
@@ -39,7 +46,7 @@
def render(self, ctx, key, args, errors):
if errors:
- value = args.get(key, [''])[0]
+ value = _getValue4key(args, key)
else:
value =
iforms.IStringConvertible(self.original).fromType(args.get(key))
if not self.showValueOnFailure:
@@ -51,7 +58,7 @@
return self._renderTag(ctx, key, value, True)
def processInput(self, ctx, key, args):
- value = args.get(key, [''])[0].decode(util.getPOSTCharset(ctx))
+ value = _getValue4key(args, key).decode(util.getPOSTCharset(ctx))
value = iforms.IStringConvertible(self.original).toType(value)
return self.original.validate(value)
@@ -77,7 +84,7 @@
def render(self, ctx, key, args, errors):
if errors:
- value = args.get(key, [''])[0]
+ value = _getValue4key(args, key)
else:
value =
iforms.IBooleanConvertible(self.original).fromType(args.get(key))
return self._renderTag(ctx, key, value, False)
@@ -130,7 +137,7 @@
def render(self, ctx, key, args, errors):
if errors:
- value = args.get(key, [''])[0]
+ value = _getValue4key(args, key)
else:
value =
iforms.IStringConvertible(self.original).fromType(args.get(key))
return self._renderTag(ctx, key, value, False)
@@ -140,7 +147,7 @@
return self._renderTag(ctx, key, value, True)
def processInput(self, ctx, key, args):
- value = args.get(key, [''])[0].decode(util.getPOSTCharset(ctx))
+ value = _getValue4key(args, key).decode(util.getPOSTCharset(ctx))
value = iforms.IStringConvertible(self.original).fromType(value)
return self.original.validate(value)
@@ -171,6 +178,7 @@
return [
T.input(type='password', name=key, id=keytocssid(ctx.key),
value=values[0], class_='readonly', readonly='readonly'),
T.br,
+ T.xml('\n'),
T.label(for_='%s__confirm'%keytocssid(ctx.key))[' Confirm '],
T.input(type='password', name=key,
id='%s__confirm'%keytocssid(ctx.key), value=values[1], class_='readonly',
readonly='readonly')
]
@@ -212,7 +220,7 @@
self.noneOption = noneOption
def processInput(self, ctx, key, args):
- value = args.get(key, [''])[0]
+ value = _getValue4key(args, key)
value = iforms.IStringConvertible(self.original).toType(value)
if self.noneOption is not None and value == self.noneOption[0]:
value = None
@@ -236,7 +244,7 @@
def renderOptions(ctx, data):
if self.noneOption is not None:
- yield
T.option(value=iforms.IKey(self.noneOption).key())[iforms.ILabel(self.noneOption).label()]
+ yield T.xml('\n'),
T.option(value=iforms.IKey(self.noneOption).key())[iforms.ILabel(self.noneOption).label()]
if data is None:
return
for item in data:
@@ -246,7 +254,7 @@
option = T.option(value=optValue)[optLabel]
if optValue == value:
option = option(selected='selected')
- yield option
+ yield T.xml('\n'), option
tag=T.select(name=key, id=keytocssid(ctx.key),
data=self.options)[renderOptions]
if disabled:
@@ -256,7 +264,7 @@
def render(self, ctx, key, args, errors):
converter = iforms.IStringConvertible(self.original)
if errors:
- value = args.get(key, [''])[0]
+ value = _getValue4key(args, key)
else:
value = converter.fromType(args.get(key))
return self._renderTag(ctx, key, value, converter, False)
@@ -283,7 +291,7 @@
tag = T.input(name=key, type='radio', id=cssid, value=itemKey)
if selected:
tag = tag(checked='checked')
- return tag, ' ', T.label(for_=cssid)[itemLabel], T.br
+ return tag, ' ', T.label(for_=cssid)[itemLabel], T.br, T.xml('\n')
def renderOptions(ctx, data):
# A counter to assign unique ids to each input
@@ -305,7 +313,7 @@
def render(self, ctx, key, args, errors):
converter = iforms.IStringConvertible(self.original)
if errors:
- value = args.get(key, [''])[0]
+ value = _getValue4key(args, key)
else:
value = converter.fromType(args.get(key))
return self._renderTag(ctx, key, value, converter, False)
@@ -324,16 +332,16 @@
The default entry format is the US (month, day, year) but can be switched
to
the more common (day, month, year) by setting the dayFirst attribute to
True.
-
+
By default the widget is designed to only accept unambiguous years, i.e.
the user must enter 4 character dates.
-
+
Many people find it convenient or even necessary to allow a 2 character
year. This can be allowed by setting the twoCharCutoffYear attribute to an
integer value between 0 and 99. Anything greater than or equal to the
cutoff
year will be considered part of the 20th century (1900 + year); anything
less the cutoff year is a 21st century (2000 + year) date.
-
+
A typical twoCharCutoffYear value is 70 (i.e. 1970). However, that value
is
somewhat arbitrary. It's the year that time began according to the PC, but
it doesn't mean much to your non-techie user.
@@ -584,7 +592,7 @@
def render(self, ctx, key, args, errors):
if errors:
- value = args.get(key, [''])[0]
+ value = _getValue4key(args, key)
else:
value =
iforms.IFileConvertible(self.original).fromType(args.get(key))
return self._renderTag(ctx, key, False)
@@ -883,7 +891,7 @@
return self.render(ctx, key, args, errors)
def processInput(self, ctx, key, args):
- value = args.get(key, [''])[0].decode(util.getPOSTCharset(ctx))
+ value = _getValue4key(args, key).decode(util.getPOSTCharset(ctx))
value = iforms.IStringConvertible(self.original).toType(value)
return self.original.validate(value)
_______________________________________________
Twisted-web mailing list
[email protected]
http://twistedmatrix.com/cgi-bin/mailman/listinfo/twisted-web
