Mercurial Repository: p/roundup/code: roundup/cgi/client.py comparison

comparison roundup/cgi/client.py @ 1055:cf72eae57a2c

Fixed instance installation ... moved the htmlbase module into templates and call it <template>_htmlbase.py ... no more try/except in instance __init__! Added :required to form handling. Handle multiple values for single form items with decent error report.

author	Richard Jones <richard@users.sourceforge.net>
date	Thu, 05 Sep 2002 23:39:14 +0000
parents	3d8ea16347aa
children	1c2a2ecc1b03

comparison

equal deleted inserted replaced

-:3d8ea16347aa
+:cf72eae57a2c
-# $Id: client.py,v 1.14 2002-09-05 05:25:23 richard Exp $
+# $Id: client.py,v 1.15 2002-09-05 23:39:12 richard Exp $
 __doc__ = """
 WWW request handler (also used in the stand-alone server).
 """
 4. render a template, resulting in HTML output
 In some situations, exceptions occur:
 - HTTP Redirect  (generally raised by an action)
 - SendFile       (generally raised by determine_context)
+serve up a FileClass "content" property
 - SendStaticFile (generally raised by determine_context)
-- Unauthorised   (raised pretty much anywhere it needs to be)
+serve up a file from the tracker "html" directory
-- NotFound       (see above... percolates up to the CGI interface)
+- Unauthorised   (generally raised by an action)
+the action is cancelled, the request is rendered and an error
+message is displayed indicating that permission was not
+granted for the action to take place
+- NotFound       (raised wherever it needs to be)
+percolates up to the CGI interface that called the client
 '''
 self.content_action = None
 self.ok_message = []
 self.error_message = []
 try:
 "messages" property.
 __file
 Create a file and attach it to the current node's
 "files" property. Attach the file to the message created from
 the __note if it's supplied.
+:required=property,property,...
+The named properties are required to be filled in the form.
 '''
 cl = self.db.classes[self.classname]
 # parse the props from the form
 try:
 return 0
 def newItemAction(self):
 ''' Add a new item to the database.
-This follows the same form as the editItemAction
+This follows the same form as the editItemAction, with the same
+special form values.
 '''
 cl = self.db.classes[self.classname]
 # parse the props from the form
 try:
 link = self.db.classes[link]
 link.set(nodeid, **{property: nid})
 def parsePropsFromForm(db, cl, form, nodeid=0, num_re=re.compile('^\d+$')):
-'''Pull properties for the given class out of the form.
+''' Pull properties for the given class out of the form.
+If a ":required" parameter is supplied, then the names property values
+must be supplied or a ValueError will be raised.
 '''
+required = []
+if form.has_key(':required'):
+value = form[':required']
+if isinstance(value, type([])):
+required = [i.value.strip() for i in value]
+else:
+required = [i.strip() for i in value.value.split(',')]
 props = {}
 keys = form.keys()
 for key in keys:
 if not cl.properties.has_key(key):
 continue
 proptype = cl.properties[key]
+# Get the form value. This value may be a MiniFieldStorage or a list
+# of MiniFieldStorages.
+value = form[key]
+# make sure non-multilinks only get one value
+if not isinstance(proptype, hyperdb.Multilink):
+if isinstance(value, type([])):
+raise ValueError, 'You have submitted more than one value'\
+' for the %s property'%key
+# we've got a MiniFieldStorage, so pull out the value and strip
+# surrounding whitespace
+value = value.value.strip()
 if isinstance(proptype, hyperdb.String):
+pass
 value = form[key].value.strip()
 elif isinstance(proptype, hyperdb.Password):
-value = form[key].value.strip()
 if not value:
 # ignore empty password values
 continue
 value = password.Password(value)
 elif isinstance(proptype, hyperdb.Date):
-value = form[key].value.strip()
 if value:
 value = date.Date(form[key].value.strip())
 else:
 value = None
 elif isinstance(proptype, hyperdb.Interval):
-value = form[key].value.strip()
 if value:
 value = date.Interval(form[key].value.strip())
 else:
 value = None
 elif isinstance(proptype, hyperdb.Link):
-value = form[key].value.strip()
 # see if it's the "no selection" choice
 if value == '-1':
 value = None
 else:
 # handle key values
 except KeyError:
 raise ValueError, _('property "%(propname)s": '
 '%(value)s not a %(classname)s')%{'propname':key,
 'value': value, 'classname': link}
 elif isinstance(proptype, hyperdb.Multilink):
-value = form[key]
+if isinstance(value, type([])):
-if not isinstance(value, type([])):
+# it's a list of MiniFieldStorages
+value = [i.value.strip() for i in value]
+else:
+# it's a MiniFieldStorage, but may be a comma-separated list
+# of values
 value = [i.strip() for i in value.value.split(',')]
-else:
-value = [i.value.strip() for i in value]
 link = cl.properties[key].classname
 l = []
 for entry in map(str, value):
 if entry == '': continue
 if not num_re.match(entry):
 'propname':key, 'value': entry, 'classname': link}
 l.append(entry)
 l.sort()
 value = l
 elif isinstance(proptype, hyperdb.Boolean):
-value = form[key].value.strip()
 props[key] = value = value.lower() in ('yes', 'true', 'on', '1')
 elif isinstance(proptype, hyperdb.Number):
-value = form[key].value.strip()
 props[key] = value = int(value)
 # get the old value
 if nodeid:
 try:
 # if changed, set it
 if value != existing:
 props[key] = value
 else:
 props[key] = value
+# see if all the required properties have been supplied
+l = []
+for property in required:
+if not props.has_key(property):
+l.append(property)
+if l:
+raise ValueError, 'Required properties %s not supplied'%(', '.join(l))
 return props

Mercurial > p > roundup > code

comparison roundup/cgi/client.py @ 1055:cf72eae57a2c