Ticket #478: form.diff

form.py

old	new
6	6
7	7	class FormField:
8	8
9		def __init__(self, label, name, typ, mask=None, mandatory=0, size=15,
	9	def __init__(self, label, name, typ, mask=None, mandatory=0, size='15',
10	10	optionList=[], defaultValue='', defaultMessage='', validate=None):
11	11	self.isField = 1
12	12	self.label = label
…	…
48	48
49	49
50	50	class Form:
51
52		method = "post"
53		enctype = ""
54
	51
	52	def __init__(self, action = "postForm", method = "post", enctype = "", header = defaultformmask.defaultHeader, footer = defaultformmask.defaultFooter, headerLabel = "", footerLabel = ""):
	53	self.action = action
	54	self.method = method
	55	self.enctype = enctype
	56	self.header = header
	57	self.footer = footer
	58	self.headerLabel = headerLabel
	59	self.footerLabel = footerLabel
	60
55	61	def formView(self, leaveValues=0):
56	62	if self.enctype:
57	63	enctypeTag = 'enctype="%s"' % self.enctype
58	64	else:
59	65	enctypeTag = ""
60
61		res = ['<form method="%s" %s action="postForm">'
62		% (self.method, enctypeTag)]
	66
	67	res = ['<form method="%s" %s action="%s">'
	68	% (self.method, enctypeTag, self.action)]
	69	res.append(self.header(self.headerLabel))
63	70	for field in self.fieldList:
64	71	res.append(field.render(leaveValues))
65		res.append["</form>"]
66
	72	res.append(self.footer(self.footerLabel))
	73	res.append("</form>")
67	74	return "".join(res)
68	75
69	76	def validateFields(self):

old	new
59	59	else:
60	60	vals = [field.currentValue]
61	61	i = '<input name=%s type="hidden" value=%%s />' % q(field.name)
62		return [i % q(v) for v in vals]
	62	return ''.join([i % q(v) for v in vals])
63	63	elif field.typ in ('checkbox', 'radio'):
64	64	res.append('<td>')
65	65	for option in field.optionList: