Skip to content

Commit e21f93b

Browse files
author
Richard Jones
committed
better detection of unset required props
1 parent de791aa commit e21f93b

File tree

1 file changed

+17
-18
lines changed

1 file changed

+17
-18
lines changed

roundup/cgi/client.py

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# $Id: client.py,v 1.40 2002-09-19 02:37:41 richard Exp $
1+
# $Id: client.py,v 1.41 2002-09-24 02:00:09 richard Exp $
22

33
__doc__ = """
44
WWW request handler (also used in the stand-alone server).
@@ -1139,30 +1139,29 @@ def parsePropsFromForm(db, cl, form, nodeid=0, num_re=re.compile('^\d+$')):
11391139
if value:
11401140
value = date.Date(form[key].value.strip())
11411141
else:
1142-
value = None
1142+
continue
11431143
elif isinstance(proptype, hyperdb.Interval):
11441144
if value:
11451145
value = date.Interval(form[key].value.strip())
11461146
else:
1147-
value = None
1147+
continue
11481148
elif isinstance(proptype, hyperdb.Link):
11491149
# see if it's the "no selection" choice
11501150
if value == '-1':
1151-
value = None
1152-
else:
1153-
# handle key values
1154-
link = proptype.classname
1155-
if not num_re.match(value):
1156-
try:
1157-
value = db.classes[link].lookup(value)
1158-
except KeyError:
1159-
raise ValueError, _('property "%(propname)s": '
1160-
'%(value)s not a %(classname)s')%{'propname':key,
1161-
'value': value, 'classname': link}
1162-
except TypeError, message:
1163-
raise ValueError, _('you may only enter ID values '
1164-
'for property "%(propname)s": %(message)s')%{
1165-
'propname':key, 'message': message}
1151+
continue
1152+
# handle key values
1153+
link = proptype.classname
1154+
if not num_re.match(value):
1155+
try:
1156+
value = db.classes[link].lookup(value)
1157+
except KeyError:
1158+
raise ValueError, _('property "%(propname)s": '
1159+
'%(value)s not a %(classname)s')%{'propname':key,
1160+
'value': value, 'classname': link}
1161+
except TypeError, message:
1162+
raise ValueError, _('you may only enter ID values '
1163+
'for property "%(propname)s": %(message)s')%{
1164+
'propname':key, 'message': message}
11661165
elif isinstance(proptype, hyperdb.Multilink):
11671166
if isinstance(value, type([])):
11681167
# it's a list of MiniFieldStorages

0 commit comments

Comments
 (0)