diff roundup/cgi/client.py @ 1766:f7e98ed53a48 maint-0.6

merge from HEAD
author Richard Jones <richard@users.sourceforge.net>
date Thu, 28 Aug 2003 04:21:22 +0000
parents 2223e184f9d2
children d81d215167fd
line wrap: on
line diff
--- a/roundup/cgi/client.py	Tue Aug 26 12:55:10 2003 +0000
+++ b/roundup/cgi/client.py	Thu Aug 28 04:21:22 2003 +0000
@@ -1,4 +1,4 @@
-# $Id: client.py,v 1.130 2003-08-13 23:51:59 richard Exp $
+# $Id: client.py,v 1.130.2.1 2003-08-28 04:21:22 richard Exp $
 
 __doc__ = """
 WWW request handler (also used in the stand-alone server).
@@ -995,14 +995,14 @@
         try:
             props, links = self.parsePropsFromForm()
         except (ValueError, KeyError), message:
-            self.error_message.append(_('Error: ') + str(message))
+            self.error_message.append(_('Parse Error: ') + str(message))
             return
 
         # handle the props
         try:
             message = self._editnodes(props, links)
         except (ValueError, KeyError, IndexError), message:
-            self.error_message.append(_('Error: ') + str(message))
+            self.error_message.append(_('Apply Error: ') + str(message))
             return
 
         # commit now that all the tricky stuff is done
@@ -1252,10 +1252,10 @@
             found[nodeid] = 1
 
             # see if the node exists
-            if cl.hasnode(nodeid):
+            if nodeid in ('x', 'X') or not cl.hasnode(nodeid):
+                exists = 0
+            else:
                 exists = 1
-            else:
-                exists = 0
 
             # confirm correct weight
             if len(idlessprops) != len(values):

Roundup Issue Tracker: http://roundup-tracker.org/