%(title)s

X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=roundup%2Fcgi_client.py;h=0e446d48c3416eba68af6f936306d1c5e1bed7cd;hb=cd355af47a60fa0ea49b4a42a376066dae1c7716;hp=2fef807d88188dd5d9ad8283518ee0504de7afc9;hpb=f0a9600f7a3f855f13594ceb2e4b6cb467793cd7;p=roundup.git diff --git a/roundup/cgi_client.py b/roundup/cgi_client.py index 2fef807..0e446d4 100644 --- a/roundup/cgi_client.py +++ b/roundup/cgi_client.py @@ -15,7 +15,7 @@ # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. # -# $Id: cgi_client.py,v 1.96 2002-01-10 05:26:10 richard Exp $ +# $Id: cgi_client.py,v 1.103 2002-02-20 05:05:28 richard Exp $ __doc__ = """ WWW request handler (also used in the stand-alone server). @@ -44,21 +44,7 @@ class Client: 'anonymous' user exists, the user is logged in using that user (though there is no cookie). This allows them to modify the database, and all modifications are attributed to the 'anonymous' user. - - - Customisation - ------------- - FILTER_POSITION - one of 'top', 'bottom', 'top and bottom' - ANONYMOUS_ACCESS - one of 'deny', 'allow' - ANONYMOUS_REGISTER - one of 'deny', 'allow' - - from the roundup class: - INSTANCE_NAME - defaults to 'Roundup issue tracker' - ''' - FILTER_POSITION = 'bottom' # one of 'top', 'bottom', 'top and bottom' - ANONYMOUS_ACCESS = 'deny' # one of 'deny', 'allow' - ANONYMOUS_REGISTER = 'deny' # one of 'deny', 'allow' def __init__(self, instance, request, env, form=None): self.instance = instance @@ -94,6 +80,20 @@ class Client: if self.debug: self.headers_sent = headers + single_submit_script = ''' + +''' + def pagehead(self, title, message=None): url = self.env['SCRIPT_NAME'] + '/' machine = self.env['SERVER_NAME'] @@ -104,7 +104,7 @@ class Client: message = _('

%(message)s

')%locals() else: message = '' - style = open(os.path.join(self.TEMPLATES, 'style.css')).read() + style = open(os.path.join(self.instance.TEMPLATES, 'style.css')).read() user_name = self.user or '' if self.user == 'admin': admin_links = _(' | Class List' \ @@ -127,10 +127,12 @@ class Client: ''') else: add_links = '' + single_submit_script = self.single_submit_script self.write(_(''' %(title)s +%(single_submit_script)s %(message)s @@ -286,7 +288,7 @@ class Client: cn = self.classname cl = self.db.classes[cn] self.pagehead(_('%(instancename)s: Index of %(classname)s')%{ - 'classname': cn, 'instancename': self.INSTANCE_NAME}) + 'classname': cn, 'instancename': self.instance.INSTANCE_NAME}) if sort is None: sort = self.index_arg(':sort') if group is None: group = self.index_arg(':group') if filter is None: filter = self.index_arg(':filter') @@ -295,11 +297,89 @@ class Client: if show_customization is None: show_customization = self.customization_widget() - index = htmltemplate.IndexTemplate(self, self.TEMPLATES, cn) - index.render(filterspec, filter, columns, sort, group, - show_customization=show_customization) + index = htmltemplate.IndexTemplate(self, self.instance.TEMPLATES, cn) + try: + index.render(filterspec, filter, columns, sort, group, + show_customization=show_customization) + except htmltemplate.MissingTemplateError: + self.basicClassEditPage() self.pagefoot() + def basicClassEditPage(self): + '''Display a basic edit page that allows simple editing of the + nodes of the current class + ''' + if self.user != 'admin': + raise Unauthorised + w = self.write + cn = self.classname + cl = self.db.classes[cn] + props = ['id'] + cl.getprops(protected=0).keys() + + # get the CSV module + try: + import csv + except ImportError: + w(_('Sorry, you need the csv module to use this function.
\n' + 'Get it from: http://www.object-craft.com.au/projects/csv/')) + return + + # do the edit + if self.form.has_key('rows'): + rows = self.form['rows'].value.splitlines() + p = csv.parser() + idlessprops = props[1:] + found = {} + for row in rows: + values = p.parse(row) + # not a complete row, keep going + if not values: continue + + # extract the nodeid + nodeid, values = values[0], values[1:] + found[nodeid] = 1 + + # extract the new values + d = {} + for name, value in zip(idlessprops, values): + d[name] = value.strip() + + # perform the edit + if cl.hasnode(nodeid): + # edit existing + cl.set(nodeid, **d) + else: + # new node + found[cl.create(**d)] = 1 + + # retire the removed entries + for nodeid in cl.list(): + if not found.has_key(nodeid): + cl.retire(nodeid) + + w(_('''

You may edit the contents of the + "%(classname)s" class using this form.

Remove entries by deleting their line. Add + new entries by appending + them to the table - put an X in the id column.

\n') for cn in classnames: cl = self.db.getclass(cn) - self.write(''%cn.capitalize()) + self.write(''%(cn, cn.capitalize())) for key, value in cl.properties.items(): if value is None: value = '' else: value = str(value) @@ -750,7 +841,7 @@ class Client: self.write(_('''

%s
' + '%s

- + @@ -760,13 +851,13 @@ class Client: ''')%locals()) - if self.user is None and self.ANONYMOUS_REGISTER == 'deny': + if self.user is None and self.instance.ANONYMOUS_REGISTER == 'deny': self.write('

Existing User Login
Login name:

') self.pagefoot() return values = {'realname': '', 'organisation': '', 'address': '', 'phone': '', 'username': '', 'password': '', 'confirm': '', - 'action': action} + 'action': action, 'alternate_addresses': ''} if newuser_form is not None: for key in newuser_form.keys(): values[key] = newuser_form[key].value @@ -774,14 +865,16 @@ class Client:

New User Registration marked items are optional... -

+ Name: - + Organisation: - + E-Mail Address: - + +Alternate E-mail Addresses: + Phone: Preferred Login name: @@ -953,7 +1046,7 @@ class Client: if action == 'newuser_action': # if we don't have a login and anonymous people aren't allowed to # register, then spit up the login form - if self.ANONYMOUS_REGISTER == 'deny' and self.user is None: + if self.instance.ANONYMOUS_REGISTER == 'deny' and self.user is None: if action == 'login': self.login() # go to the index after login else: @@ -968,7 +1061,7 @@ class Client: action = 'index' # no login or registration, make sure totally anonymous access is OK - elif self.ANONYMOUS_ACCESS == 'deny' and self.user is None: + elif self.instance.ANONYMOUS_ACCESS == 'deny' and self.user is None: if action == 'login': self.login() # go to the index after login else: @@ -998,6 +1091,8 @@ class Client: if action == 'logout': self.logout() return + + # see if we're to display an existing node m = dre.match(action) if m: self.classname = m.group(1) @@ -1016,6 +1111,8 @@ class Client: raise NotFound func() return + + # see if we're to put up the new node page m = nre.match(action) if m: self.classname = m.group(1) @@ -1025,6 +1122,8 @@ class Client: raise NotFound func() return + + # otherwise, display the named class self.classname = action try: self.db.getclass(self.classname) @@ -1058,7 +1157,7 @@ class ExtendedClient(Client): message = _('

%(message)s

')%locals() else: message = '' - style = open(os.path.join(self.TEMPLATES, 'style.css')).read() + style = open(os.path.join(self.instance.TEMPLATES, 'style.css')).read() user_name = self.user or '' if self.user == 'admin': admin_links = _(' | Class List' \ @@ -1083,10 +1182,12 @@ class ExtendedClient(Client): ''') else: add_links = '' + single_submit_script = self.single_submit_script self.write(_(''' %(title)s +%(single_submit_script)s %(message)s @@ -1120,9 +1221,17 @@ def parsePropsFromForm(db, cl, form, nodeid=0): elif isinstance(proptype, hyperdb.Password): value = password.Password(form[key].value.strip()) elif isinstance(proptype, hyperdb.Date): - value = date.Date(form[key].value.strip()) + value = form[key].value.strip() + if value: + value = date.Date(form[key].value.strip()) + else: + value = None elif isinstance(proptype, hyperdb.Interval): - value = date.Interval(form[key].value.strip()) + 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 @@ -1178,6 +1287,41 @@ def parsePropsFromForm(db, cl, form, nodeid=0): # # $Log: not supported by cvs2svn $ +# Revision 1.102 2002/02/15 07:08:44 richard +# . Alternate email addresses are now available for users. See the MIGRATION +# file for info on how to activate the feature. +# +# Revision 1.101 2002/02/14 23:39:18 richard +# . All forms now have "double-submit" protection when Javascript is enabled +# on the client-side. +# +# Revision 1.100 2002/01/16 07:02:57 richard +# . lots of date/interval related changes: +# - more relaxed date format for input +# +# Revision 1.99 2002/01/16 03:02:42 richard +# #503793 ] changing assignedto resets nosy list +# +# Revision 1.98 2002/01/14 02:20:14 richard +# . changed all config accesses so they access either the instance or the +# config attriubute on the db. This means that all config is obtained from +# instance_config instead of the mish-mash of classes. This will make +# switching to a ConfigParser setup easier too, I hope. +# +# At a minimum, this makes migration a _little_ easier (a lot easier in the +# 0.5.0 switch, I hope!) +# +# Revision 1.97 2002/01/11 23:22:29 richard +# . #502437 ] rogue reactor and unittest +# in short, the nosy reactor was modifying the nosy list. That code had +# been there for a long time, and I suspsect it was there because we +# weren't generating the nosy list correctly in other places of the code. +# We're now doing that, so the nosy-modifying code can go away from the +# nosy reactor. +# +# Revision 1.96 2002/01/10 05:26:10 richard +# missed a parsePropsFromForm in last update +# # Revision 1.95 2002/01/10 03:39:45 richard # . fixed some problems with web editing and change detection #