Code

implemented multilink changes (and a unit test)
[roundup.git] / roundup / cgi_client.py
index 99a65f15c2693acc8f3bfbedab70ba7178bb81de..1f1c02dd35b21eb939bb0ee7e2f8267a61dcfa9d 100644 (file)
@@ -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.145 2002-07-26 08:26:59 richard Exp $
+# $Id: cgi_client.py,v 1.162 2002-08-23 04:42:30 richard Exp $
 
 __doc__ = """
 WWW request handler (also used in the stand-alone server).
@@ -41,6 +41,9 @@ def initialiseSecurity(security):
     '''
     security.addPermission(name="Web Registration",
         description="User may register through the web")
+    p = security.addPermission(name="Web Access",
+        description="User may access the web interface")
+    security.addPermissionToRole('Admin', p)
 
     # doing Role stuff through the web - make sure Admin can
     p = security.addPermission(name="Web Roles",
@@ -184,25 +187,32 @@ function help_window(helpurl, width, height) {
         # figure who the user is
         user_name = self.user
         userid = self.db.user.lookup(user_name)
+        default_queries = 1
+        links = []
+        if user_name != 'anonymous':
+            try:
+                default_queries = self.db.user.get(userid, 'defaultqueries')
+            except KeyError:
+                pass
 
         # figure all the header links
-        if hasattr(self.instance, 'HEADER_INDEX_LINKS'):
-            links = []
-            for name in self.instance.HEADER_INDEX_LINKS:
-                spec = getattr(self.instance, name + '_INDEX')
-                # skip if we need to fill in the logged-in user id and
-                # we're anonymous
-                if (spec['FILTERSPEC'].has_key('assignedto') and
-                        spec['FILTERSPEC']['assignedto'] in ('CURRENT USER',
-                        None) and user_name == 'anonymous'):
-                    continue
-                links.append(self.make_index_link(name))
-        else:
-            # no config spec - hard-code
-            links = [
-                _('All <a href="issue?status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:sort=-activity&:filter=status&:columns=id,activity,status,title,assignedto&:group=priority&show_customization=1">Issues</a>'),
-                _('Unassigned <a href="issue?assignedto=-1&status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:sort=-activity&:filter=status,assignedto&:columns=id,activity,status,title,assignedto&:group=priority&show_customization=1">Issues</a>')
-            ]
+        if default_queries:
+            if hasattr(self.instance, 'HEADER_INDEX_LINKS'):
+                for name in self.instance.HEADER_INDEX_LINKS:
+                    spec = getattr(self.instance, name + '_INDEX')
+                    # skip if we need to fill in the logged-in user id and
+                    # we're anonymous
+                    if (spec['FILTERSPEC'].has_key('assignedto') and
+                            spec['FILTERSPEC']['assignedto'] in ('CURRENT USER',
+                            None) and user_name == 'anonymous'):
+                        continue
+                    links.append(self.make_index_link(name))
+            else:
+                # no config spec - hard-code
+                links = [
+                    _('All <a href="issue?status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:sort=-activity&:filter=status&:columns=id,activity,status,title,assignedto&:group=priority&show_customization=1">Issues</a>'),
+                    _('Unassigned <a href="issue?assignedto=-1&status=-1,unread,deferred,chatting,need-eg,in-progress,testing,done-cbb&:sort=-activity&:filter=status,assignedto&:columns=id,activity,status,title,assignedto&:group=priority&show_customization=1">Issues</a>')
+                ]
 
         user_info = _('<a href="login">Login</a>')
         add_links = ''
@@ -232,7 +242,6 @@ function help_window(helpurl, width, height) {
 <a href="user%(userid)s">My Details</a> | <a href="logout">Logout</a>
 ''')%locals()
 
-
         # figure the "add class" links
         if hasattr(self.instance, 'HEADER_ADD_LINKS'):
             classes = self.instance.HEADER_ADD_LINKS
@@ -342,9 +351,11 @@ function help_window(helpurl, width, height) {
         return []
 
     def index_sort(self):
-        # first try query string
+        # first try query string / simple form
         x = self.index_arg(':sort')
         if x:
+            if self.index_arg(':descending'):
+                return ['-'+x[0]]
             return x
         # nope - get the specs out of the form
         specs = []
@@ -478,10 +489,8 @@ function help_window(helpurl, width, height) {
         all_columns = self.db.getclass(cn).getprops().keys()
         all_columns.sort()
         index.filter_section('', filter, columns, group, all_columns, sort,
-                             filterspec, pagesize, 0)
+                             filterspec, pagesize, 0, 0)
         self.pagefoot()
-        index.db = index.cl = index.properties = None
-        index.clear()
 
     # XXX deviates from spec - loses the '+' (that's a reserved character
     # in URLS
@@ -523,6 +532,9 @@ function help_window(helpurl, width, height) {
             startwith = int(self.form[':startwith'].value)
         else:
             startwith = 0
+        simpleform = 1
+        if self.form.has_key(':advancedsearch'):
+            simpleform = 0
 
         if self.form.has_key('Query') and self.form['Query'].value == 'Save':
             # format a query string
@@ -556,12 +568,14 @@ function help_window(helpurl, width, height) {
             
         self.pagehead(_('%(instancename)s: Index of %(classname)s')%{
             'classname': cn, 'instancename': self.instance.INSTANCE_NAME})
-        
+
         index = htmltemplate.IndexTemplate(self, self.instance.TEMPLATES, cn)
         try:
-            index.render(filterspec, search_text, filter, columns, sort, 
-                group, show_customization=show_customization, 
-                show_nodes=show_nodes, pagesize=pagesize, startwith=startwith)
+            index.render(filterspec=filterspec, search_text=search_text,
+                filter=filter, columns=columns, sort=sort, group=group,
+                show_customization=show_customization, 
+                show_nodes=show_nodes, pagesize=pagesize, startwith=startwith,
+                simple_search=simpleform)
         except htmltemplate.MissingTemplateError:
             self.basicClassEditPage()
         self.pagefoot()
@@ -572,7 +586,8 @@ function help_window(helpurl, width, height) {
         '''
         userid = self.db.user.lookup(self.user)
         if not self.db.security.hasPermission('Edit', userid):
-            raise Unauthorised
+            raise Unauthorised, _("You do not have permission to access"\
+                        " %(action)s.")%{'action': self.classname}
         w = self.write
         cn = self.classname
         cl = self.db.classes[cn]
@@ -684,7 +699,7 @@ function help_window(helpurl, width, height) {
         for name in props:
             w('<th align=left>%s</th>'%name)
         w('</tr>')
-        for nodeid in cl.filter(None, {}, sort, []): #cl.list():
+        for nodeid in cl.filter(None, {}, sort, []):
             w('<tr>')
             for name in props:
                 value = cgi.escape(str(cl.get(nodeid, name)))
@@ -697,34 +712,45 @@ function help_window(helpurl, width, height) {
         '''
         cn = self.classname
         cl = self.db.classes[cn]
+        keys = self.form.keys()
+        fromremove = 0
         if self.form.has_key(':multilink'):
-            link = self.form[':multilink'].value
-            designator, linkprop = link.split(':')
-            xtra = ' for <a href="%s">%s</a>' % (designator, designator)
+            # is the multilink there because we came from remove()?
+            if self.form.has_key(':target'):
+                xtra = ''
+                fromremove = 1
+                message = _('%s removed' % self.index_arg(":target")[0])
+            else:
+                link = self.form[':multilink'].value
+                designator, linkprop = link.split(':')
+                xtra = ' for <a href="%s">%s</a>' % (designator, designator)
         else:
             xtra = ''
-
+        
         # possibly perform an edit
-        keys = self.form.keys()
         # don't try to set properties if the user has just logged in
-        if keys and not self.form.has_key('__login_name'):
+        if keys and not fromremove and not self.form.has_key('__login_name'):
             try:
-                props = parsePropsFromForm(self.db, cl, self.form, self.nodeid)
-                # make changes to the node
-                self._changenode(props)
-                # handle linked nodes 
-                self._post_editnode(self.nodeid)
-                # and some nice feedback for the user
-                if props:
-                    message = _('%(changes)s edited ok')%{'changes':
-                        ', '.join(props.keys())}
-                elif self.form.has_key('__note') and self.form['__note'].value:
-                    message = _('note added')
-                elif (self.form.has_key('__file') and
-                        self.form['__file'].filename):
-                    message = _('file added')
+                userid = self.db.user.lookup(self.user)
+                if not self.db.security.hasPermission('Edit', userid, cn):
+                    message = _('You do not have permission to edit %s' %cn)
                 else:
-                    message = _('nothing changed')
+                    props = parsePropsFromForm(self.db, cl, self.form, self.nodeid)
+                    # make changes to the node
+                    props = self._changenode(props)
+                    # handle linked nodes 
+                    self._post_editnode(self.nodeid)
+                    # and some nice feedback for the user
+                    if props:
+                        message = _('%(changes)s edited ok')%{'changes':
+                            ', '.join(props.keys())}
+                    elif self.form.has_key('__note') and self.form['__note'].value:
+                        message = _('note added')
+                    elif (self.form.has_key('__file') and
+                            self.form['__file'].filename):
+                        message = _('file added')
+                    else:
+                        message = _('nothing changed')
             except:
                 self.db.rollback()
                 s = StringIO.StringIO()
@@ -760,6 +786,7 @@ function help_window(helpurl, width, height) {
             filterspec = self.index_filterspec(filter, queries.get(self.nodeid, 'klass'))
             if self.form.has_key('search_text'):
                 search_text = self.form['search_text'].value
+                search_text = urllib.quote(search_text)
             else:
                 search_text = ''
             if self.form.has_key(':pagesize'):
@@ -778,15 +805,9 @@ function help_window(helpurl, width, height) {
             url += '&:pagesize=%s' % pagesize
             if search_text:
                 url += '&search_text=%s' % search_text
-            qname = self.form['name'].value
-            chgd = []
-            if qname != queries.get(self.nodeid, 'name'):
-                chgd.append('name')
             if url != queries.get(self.nodeid, 'url'):
-                chgd.append('url')
-            if chgd:
-                queries.set(self.nodeid, name=qname, url=url)
-                message = _('%(changes)s edited ok')%{'changes': ', '.join(chgd)}
+                queries.set(self.nodeid, url=url)
+                message = _('url edited ok')
             else:
                 message = _('nothing changed')
         else:
@@ -813,7 +834,7 @@ function help_window(helpurl, width, height) {
             props['files'] = cl.get(self.nodeid, 'files') + files
 
         # make the changes
-        cl.set(self.nodeid, **props)
+        return cl.set(self.nodeid, **props)
 
     def _createnode(self):
         ''' create a node based on the contents of the form
@@ -911,7 +932,7 @@ function help_window(helpurl, width, height) {
                 if type(value) != type([]): value = [value]
                 for value in value:
                     designator, property = value.split(':')
-                    link, nodeid = roundupdb.splitDesignator(designator)
+                    link, nodeid = hyperdb.splitDesignator(designator)
                     link = self.db.classes[link]
                     # take a dupe of the list so we're not changing the cache
                     value = link.get(nodeid, property)[:]
@@ -922,7 +943,7 @@ function help_window(helpurl, width, height) {
                 if type(value) != type([]): value = [value]
                 for value in value:
                     designator, property = value.split(':')
-                    link, nodeid = roundupdb.splitDesignator(designator)
+                    link, nodeid = hyperdb.splitDesignator(designator)
                     link = self.db.classes[link]
                     link.set(nodeid, **{property: nid})
 
@@ -951,7 +972,8 @@ function help_window(helpurl, width, height) {
         cn = self.classname
         userid = self.db.user.lookup(self.user)
         if not self.db.security.hasPermission('View', userid, cn):
-            raise Unauthorised
+            raise Unauthorised, _("You do not have permission to access"\
+                        " %(action)s.")%{'action': self.classname}
         cl = self.db.classes[cn]
         if self.form.has_key(':multilink'):
             link = self.form[':multilink'].value
@@ -965,7 +987,8 @@ function help_window(helpurl, width, height) {
         if [i for i in keys if i[0] != ':']:
             # no dice if you can't edit!
             if not self.db.security.hasPermission('Edit', userid, cn):
-                raise Unauthorised
+                raise Unauthorised, _("You do not have permission to access"\
+                            " %(action)s.")%{'action': 'new'+self.classname}
             props = {}
             try:
                 nid = self._createnode()
@@ -1008,7 +1031,8 @@ function help_window(helpurl, width, height) {
         '''
         userid = self.db.user.lookup(self.user)
         if not self.db.security.hasPermission('Edit', userid, 'user'):
-            raise Unauthorised
+            raise Unauthorised, _("You do not have permission to access"\
+                        " %(action)s.")%{'action': 'newuser'}
 
         cn = self.classname
         cl = self.db.classes[cn]
@@ -1046,7 +1070,8 @@ function help_window(helpurl, width, height) {
         '''
         userid = self.db.user.lookup(self.user)
         if not self.db.security.hasPermission('Edit', userid, 'file'):
-            raise Unauthorised
+            raise Unauthorised, _("You do not have permission to access"\
+                        " %(action)s.")%{'action': 'newfile'}
         cn = self.classname
         cl = self.db.classes[cn]
         props = parsePropsFromForm(self.db, cl, self.form)
@@ -1090,20 +1115,18 @@ function help_window(helpurl, width, height) {
 
     def showuser(self, message=None, num_re=re.compile('^\d+$')):
         '''Display a user page for editing. Make sure the user is allowed
-            to edit this node, and also check for password changes.
+           to edit this node, and also check for password changes.
+
+           Note: permission checks for this node are handled in the template.
         '''
         user = self.db.user
 
         # get the username of the node being edited
-        node_user = user.get(self.nodeid, 'username')
+        try:
+            node_user = user.get(self.nodeid, 'username')
+        except IndexError:
+            raise NotFound, 'user%s'%self.nodeid
 
-        # ok, so we need to be able to edit everything, or be this node's
-        # user
-        userid = self.db.user.lookup(self.user)
-        if (not self.db.security.hasPermission('Edit', userid)
-                and self.user != node_user):
-            raise Unauthorised
-        
         #
         # perform any editing
         #
@@ -1150,14 +1173,22 @@ function help_window(helpurl, width, height) {
     def showfile(self):
         ''' display a file
         '''
+       # nothing in xtrapath - edit the file's metadata
+        if self.xtrapath is None:
+            return self.shownode()
+
+        # something in xtrapath - download the file    
         nodeid = self.nodeid
         cl = self.db.classes[self.classname]
-        mime_type = cl.get(nodeid, 'type')
+        try:
+            mime_type = cl.get(nodeid, 'type')
+        except IndexError:
+            raise NotFound, 'file%s'%nodeid
         if mime_type == 'message/rfc822':
             mime_type = 'text/plain'
         self.header(headers={'Content-Type': mime_type})
         self.write(cl.get(nodeid, 'content'))
-
+        
     def permission(self):
         '''
         '''
@@ -1167,7 +1198,8 @@ function help_window(helpurl, width, height) {
         '''
         userid = self.db.user.lookup(self.user)
         if not self.db.security.hasPermission('Edit', userid):
-            raise Unauthorised
+            raise Unauthorised, _("You do not have permission to access"\
+                        " %(action)s.")%{'action': 'all classes'}
 
         self.pagehead(_('Table of classes'), message)
         classnames = self.db.classes.keys()
@@ -1185,10 +1217,37 @@ function help_window(helpurl, width, height) {
         self.write('</table>')
         self.pagefoot()
 
+    def unauthorised(self, message):
+        ''' The user is not authorised to do something. If they're
+            anonymous, throw up a login box. If not, just tell them they
+            can't do whatever it was they were trying to do.
+
+            Bot cases print up the message, which is most likely the
+            argument to the Unauthorised exception.
+        '''
+        self.header(response=403)
+        if self.desired_action is None or self.desired_action == 'login':
+            if not message:
+                message=_("You do not have permission.")
+            action = 'index'
+        else:
+            if not message:
+                message=_("You do not have permission to access"\
+                    " %(action)s.")%{'action': self.desired_action}
+            action = self.desired_action
+        if self.user == 'anonymous':
+            self.login(action=action, message=message)
+        else:
+            self.pagehead(_('Not Authorised'))
+            self.write('<p class="system-msg">%s</p>'%message)
+            self.pagefoot()
+
     def login(self, message=None, newuser_form=None, action='index'):
         '''Display a login page.
         '''
-        self.pagehead(_('Login to roundup'), message)
+        self.pagehead(_('Login to roundup'))
+        if message:
+            self.write('<p class="system-msg">%s</p>'%message)
         self.write(_('''
 <table>
 <tr><td colspan=2 class="strong-header">Existing User Login</td></tr>
@@ -1289,11 +1348,13 @@ function help_window(helpurl, width, height) {
         # make sure we're allowed to register
         userid = self.db.user.lookup(self.user)
         if not self.db.security.hasPermission('Web Registration', userid):
-            raise Unauthorised
+            raise Unauthorised, _("You do not have permission to access"\
+                        " %(action)s.")%{'action': 'registration'}
 
         # re-open the database as "admin"
-        self.opendb('admin')
-
+        if self.user != 'admin':
+            self.opendb('admin')
+            
         # create the new user
         cl = self.db.user
         try:
@@ -1311,27 +1372,25 @@ function help_window(helpurl, width, height) {
         # re-open the database for real, using the user
         self.opendb(self.user)
         password = cl.get(uid, 'password')
-        self.set_cookie(self.user, self.form['password'].value)
+        self.set_cookie(self.user, password)
         return 1
 
     def set_cookie(self, user, password):
         # TODO generate a much, much stronger session key ;)
-        session = binascii.b2a_base64(repr(time.time())).strip()
+        self.session = binascii.b2a_base64(repr(time.time())).strip()
 
         # clean up the base64
-        if session[-1] == '=':
-          if session[-2] == '=':
-            session = session[:-2]
-          else:
-            session = session[:-1]
+        if self.session[-1] == '=':
+            if self.session[-2] == '=':
+                self.session = self.session[:-2]
+            else:
+                self.session = self.session[:-1]
 
         # insert the session in the sessiondb
-        sessions = self.db.getclass('__sessions')
-        self.session = sessions.create(sessid=session, user=user,
-            last_use=date.Date())
+        self.db.sessions.set(self.session, user=user, last_use=time.time())
 
         # and commit immediately
-        self.db.commit()
+        self.db.sessions.commit()
 
         # expire us in a long, long time
         expire = Cookie._getdate(86400*365)
@@ -1340,10 +1399,10 @@ function help_window(helpurl, width, height) {
         path = '/'.join((self.env['SCRIPT_NAME'], self.env['INSTANCE_NAME'],
             ''))
         self.header({'Set-Cookie': 'roundup_user=%s; expires=%s; Path=%s;'%(
-            session, expire, path)})
+            self.session, expire, path)})
 
     def make_user_anonymous(self):
-        ''' Make use anonymous
+        ''' Make us anonymous
 
             This method used to handle non-existence of the 'anonymous'
             user, but that user is mandatory now.
@@ -1352,7 +1411,10 @@ function help_window(helpurl, width, height) {
         self.user = 'anonymous'
 
     def logout(self, message=None):
+        ''' Make us really anonymous - nuke the cookie too
+        '''
         self.make_user_anonymous()
+
         # construct the logout cookie
         now = Cookie._getdate()
         path = '/'.join((self.env['SCRIPT_NAME'], self.env['INSTANCE_NAME'],
@@ -1363,23 +1425,11 @@ function help_window(helpurl, width, height) {
         self.login()
 
     def opendb(self, user):
-        ''' Open the database - but include the definition of the sessions db.
+        ''' Open the database.
         '''
-        # open the db
-        self.db = self.instance.open(user)
-
-        # make sure we have the session Class
-        try:
-            sessions = self.db.getclass('__sessions')
-        except:
-            # add the sessions Class - use a non-journalling Class
-            # TODO: not happy with how we're getting the Class here :(
-            sessions = self.instance.dbinit.Class(self.db, '__sessions',
-                sessid=hyperdb.String(), user=hyperdb.String(),
-                last_use=hyperdb.Date())
-            sessions.setkey('sessid')
-            # make sure session db isn't journalled
-            sessions.disableJournalling()
+        # open the db if the user has changed
+        if not hasattr(self, 'db') or user != self.db.journaltag:
+            self.db = self.instance.open(user)
 
     def main(self):
         ''' Wrap the request and handle unauthorised requests
@@ -1387,12 +1437,8 @@ function help_window(helpurl, width, height) {
         self.desired_action = None
         try:
             self.main_action()
-        except Unauthorised:
-            self.header(response=403)
-            if self.desired_action is None or self.desired_action == 'login':
-                self.login()             # go to the index after login
-            else:
-                self.login(action=self.desired_action)
+        except Unauthorised, message:
+            self.unauthorised(message)
 
     def main_action(self):
         '''Wrap the database accesses so we can close the database cleanly
@@ -1401,12 +1447,12 @@ function help_window(helpurl, width, height) {
         self.opendb('admin')
 
         # make sure we have the session Class
-        sessions = self.db.getclass('__sessions')
+        sessions = self.db.sessions
 
         # age sessions, remove when they haven't been used for a week
         # TODO: this shouldn't be done every access
-        week = date.Interval('7d')
-        now = date.Date()
+        week = 60*60*24*7
+        now = time.time()
         for sessid in sessions.list():
             interval = now - sessions.get(sessid, 'last_use')
             if interval > week:
@@ -1415,27 +1461,25 @@ function help_window(helpurl, width, height) {
         # look up the user session cookie
         cookie = Cookie.Cookie(self.env.get('HTTP_COOKIE', ''))
         user = 'anonymous'
+
         if (cookie.has_key('roundup_user') and
                 cookie['roundup_user'].value != 'deleted'):
 
             # get the session key from the cookie
-            session = cookie['roundup_user'].value
-
+            self.session = cookie['roundup_user'].value
             # get the user from the session
             try:
-                self.session = sessions.lookup(session)
+                # update the lifetime datestamp
+                sessions.set(self.session, last_use=time.time())
+                sessions.commit()
+                user = sessions.get(self.session, 'user')
             except KeyError:
                 user = 'anonymous'
-            else:
-                # update the lifetime datestamp
-                sessions.set(self.session, last_use=date.Date())
-                self.db.commit()
-                user = sessions.get(sessid, 'user')
 
         # sanity check on the user still being valid
         try:
             self.db.user.lookup(user)
-        except KeyError:
+        except (KeyError, TypeError):
             user = 'anonymous'
 
         # make sure the anonymous user is valid if we're using it
@@ -1446,19 +1490,17 @@ function help_window(helpurl, width, height) {
 
         # now figure which function to call
         path = self.split_path
+        self.xtrapath = None
 
         # default action to index if the path has no information in it
         if not path or path[0] in ('', 'index'):
             action = 'index'
         else:
             action = path[0]
+            if len(path) > 1:
+                self.xtrapath = path[1:]
         self.desired_action = action
 
-        # Everthing ignores path[1:]
-        #  - The file download link generator actually relies on this - it
-        #    appends the name of the file to the URL so the download file name
-        #    is correct, but doesn't actually use it.
-
         # everyone is allowed to try to log in
         if action == 'login_action':
             # try to login
@@ -1466,29 +1508,39 @@ function help_window(helpurl, width, height) {
                 return
             # figure the resulting page
             action = self.form['__destination_url'].value
-            if not action:
-                action = 'index'
-            self.do_action(action)
-            return
 
         # allow anonymous people to register
-        if action == 'newuser_action':
+        elif action == 'newuser_action':
             # try to add the user
             if not self.newuser_action():
                 return
             # figure the resulting page
             action = self.form['__destination_url'].value
-            if not action:
-                action = 'index'
+
+        # ok, now we have figured out who the user is, make sure the user
+        # has permission to use this interface
+        userid = self.db.user.lookup(self.user)
+        if not self.db.security.hasPermission('Web Access', userid):
+            raise Unauthorised, \
+                _("You do not have permission to access this interface.")
 
         # re-open the database for real, using the user
         self.opendb(self.user)
 
-        # just a regular action
-        self.do_action(action)
+        # make sure we have a sane action
+        if not action:
+            action = 'index'
 
-        # commit all changes to the database
-        self.db.commit()
+        # just a regular action
+        try:
+            self.do_action(action)
+        except Unauthorised, message:
+            # if unauth is raised here, then a page header will have 
+            # been displayed
+            self.write('<p class="system-msg">%s</p>'%message)
+        else:
+            # commit all changes to the database
+            self.db.commit()
 
     def do_action(self, action, dre=re.compile(r'([^\d]+)(\d+)'),
             nre=re.compile(r'new(\w+)'), sre=re.compile(r'search(\w+)')):
@@ -1510,6 +1562,9 @@ function help_window(helpurl, width, height) {
         if action == 'logout':
             self.logout()
             return
+        if action == 'remove':
+            self.remove()
+            return
 
         # see if we're to display an existing node
         m = dre.match(action)
@@ -1561,6 +1616,31 @@ function help_window(helpurl, width, height) {
             raise NotFound, self.classname
         self.list()
 
+    def remove(self,  dre=re.compile(r'([^\d]+)(\d+)')):
+        target = self.index_arg(':target')[0]
+        m = dre.match(target)
+        if m:
+            classname = m.group(1)
+            nodeid = m.group(2)
+            cl = self.db.getclass(classname)
+            cl.retire(nodeid)
+            # now take care of the reference
+            parentref =  self.index_arg(':multilink')[0]
+            parent, prop = parentref.split(':')
+            m = dre.match(parent)
+            if m:
+                self.classname = m.group(1)
+                self.nodeid = m.group(2)
+                cl = self.db.getclass(self.classname)
+                value = cl.get(self.nodeid, prop)
+                value.remove(nodeid)
+                cl.set(self.nodeid, **{prop:value})
+                func = getattr(self, 'show%s'%self.classname)
+                return func()
+            else:
+                raise NotFound, parent
+        else:
+            raise NotFound, target
 
 class ExtendedClient(Client): 
     '''Includes pages and page heading information that relate to the
@@ -1608,8 +1688,7 @@ def parsePropsFromForm(db, cl, form, nodeid=0, num_re=re.compile('^\d+$')):
             value = form[key].value.strip()
             # see if it's the "no selection" choice
             if value == '-1':
-                # don't set this property
-                continue
+                value = None
             else:
                 # handle key values
                 link = cl.properties[key].classname
@@ -1668,6 +1747,76 @@ def parsePropsFromForm(db, cl, form, nodeid=0, num_re=re.compile('^\d+$')):
 
 #
 # $Log: not supported by cvs2svn $
+# Revision 1.161  2002/08/19 00:21:10  richard
+# removed debug prints
+#
+# Revision 1.160  2002/08/19 00:20:34  richard
+# grant web access to admin ;)
+#
+# Revision 1.159  2002/08/16 04:29:41  richard
+# bugfix
+#
+# Revision 1.158  2002/08/15 00:40:10  richard
+# cleanup
+#
+# Revision 1.157  2002/08/13 20:16:09  gmcm
+# Use a real parser for templates.
+# Rewrite htmltemplate to use the parser (hack, hack).
+# Move the "do_XXX" methods to template_funcs.py.
+# Redo the funcion tests (but not Template tests - they're hopeless).
+# Simplified query form in cgi_client.
+# Ability to delete msgs, files, queries.
+# Ability to edit the metadata on files.
+#
+# Revision 1.156  2002/08/01 15:06:06  gmcm
+# Use same regex to split search terms as used to index text.
+# Fix to back_metakit for not changing journaltag on reopen.
+# Fix htmltemplate's do_link so [No <whatever>] strings are href'd.
+# Fix bogus "nosy edited ok" msg - the **d syntax does NOT share d between caller and callee.
+#
+# Revision 1.155  2002/08/01 00:56:22  richard
+# Added the web access and email access permissions, so people can restrict
+# access to users who register through the email interface (for example).
+# Also added "security" command to the roundup-admin interface to display the
+# Role/Permission config for an instance.
+#
+# Revision 1.154  2002/07/31 23:57:36  richard
+#  . web forms may now unset Link values (like assignedto)
+#
+# Revision 1.153  2002/07/31 22:40:50  gmcm
+# Fixes to the search form and saving queries.
+# Fixes to  sorting in back_metakit.py.
+#
+# Revision 1.152  2002/07/31 22:04:14  richard
+# cleanup
+#
+# Revision 1.151  2002/07/30 21:37:43  richard
+# oops, thanks Duncan Booth for spotting this one
+#
+# Revision 1.150  2002/07/30 20:43:18  gmcm
+# Oops, fix the permission check!
+#
+# Revision 1.149  2002/07/30 20:04:38  gmcm
+# Adapt metakit backend to new security scheme.
+# Put some more permission checks in cgi_client.
+#
+# Revision 1.148  2002/07/30 16:09:11  gmcm
+# Simple optimization.
+#
+# Revision 1.147  2002/07/30 08:22:38  richard
+# Session storage in the hyperdb was horribly, horribly inefficient. We use
+# a simple anydbm wrapper now - which could be overridden by the metakit
+# backend or RDB backend if necessary.
+# Much, much better.
+#
+# Revision 1.146  2002/07/30 05:27:30  richard
+# nicer error messages, and a bugfix
+#
+# Revision 1.145  2002/07/26 08:26:59  richard
+# Very close now. The cgi and mailgw now use the new security API. The two
+# templates have been migrated to that setup. Lots of unit tests. Still some
+# issue in the web form for editing Roles assigned to users.
+#
 # Revision 1.144  2002/07/25 07:14:05  richard
 # Bugger it. Here's the current shape of the new security implementation.
 # Still to do: