merge from HEAD

Author: Richard Jones

CHANGES.txt

@@ -7,6 +7,9 @@ Fixed:
 - Importing wasn't setting None values explicitly when it should have been
 - Fixed import warning regarding 0xffff0000 literal, finally, really this
   time. Checked on win2k. (sf bug 786711)
+- fix CGI editCSV action to handle metakit's integer itemids
+- apply fix for "remove" links from Klamer Schutte
+- added permission check on "remove" link while I was there..
 
 
 2003-08-08 0.6.0

doc/index.txt

@@ -81,6 +81,7 @@ Florian Schulze,
 Dougal Scott,
 Stefan Seefeld,
 Jeffrey P Shell,
+Klamer Schutte,
 Joel Shprentz,
 Terrel Shumway,
 Nathaniel Smith,

roundup/cgi/client.py

@@ -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 @@ def editItemAction(self):
         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 @@ def editCSVAction(self):
             found[nodeid] = 1
 
             # see if the node exists
-            if cl.hasnode(nodeid):
-                exists = 1
-            else:
+            if nodeid in ('x', 'X') or not cl.hasnode(nodeid):
                 exists = 0
+            else:
+                exists = 1
 
             # confirm correct weight
             if len(idlessprops) != len(values):

templates/classic/html/issue.item.html

@@ -140,7 +140,8 @@ <h2>
     <th tal:content="string:Author: ${msg/author}">author</th>
     <th tal:content="string:Date: ${msg/date}">date</th>
     <th>
-     <a tal:attributes="href string:?:remove:messages=${msg/id}&:action=edit">remove</a>
+     <a tal:condition="context/is_edit_ok"
+        tal:attributes="href string:issue${context/id}?:remove:messages=${msg/id}&:action=edit">remove</a>
     </th>
    </tr>
    <tr>