|
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 $ |
2 | 2 |
|
3 | 3 | __doc__ = """ |
4 | 4 | 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+$')): |
1139 | 1139 | if value: |
1140 | 1140 | value = date.Date(form[key].value.strip()) |
1141 | 1141 | else: |
1142 | | - value = None |
| 1142 | + continue |
1143 | 1143 | elif isinstance(proptype, hyperdb.Interval): |
1144 | 1144 | if value: |
1145 | 1145 | value = date.Interval(form[key].value.strip()) |
1146 | 1146 | else: |
1147 | | - value = None |
| 1147 | + continue |
1148 | 1148 | elif isinstance(proptype, hyperdb.Link): |
1149 | 1149 | # see if it's the "no selection" choice |
1150 | 1150 | 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} |
1166 | 1165 | elif isinstance(proptype, hyperdb.Multilink): |
1167 | 1166 | if isinstance(value, type([])): |
1168 | 1167 | # it's a list of MiniFieldStorages |
|
0 commit comments