From e70a6a8222f741b4b0b3f304f7c679330348046c Mon Sep 17 00:00:00 2001
From: richard <richard@57a73879-2fb5-44c3-a270-3262357dd7e2>
Date: Thu, 28 Aug 2003 01:39:15 +0000
Subject: [PATCH]  - 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..

git-svn-id: http://svn.roundup-tracker.org/svnroot/roundup/trunk@1832 57a73879-2fb5-44c3-a270-3262357dd7e2
---
 CHANGES.txt                            |  3 +++
 doc/index.txt                          |  1 +
 roundup/cgi/client.py                  | 12 ++++++------
 templates/classic/html/issue.item.html |  3 ++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index 41db9d6..b434601 100644
--- a/CHANGES.txt
+++ b/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
diff --git a/doc/index.txt b/doc/index.txt
index 5675e7b..47b7e82 100644
--- a/doc/index.txt
+++ b/doc/index.txt
@@ -81,6 +81,7 @@ Florian Schulze,
 Dougal Scott,
 Stefan Seefeld,
 Jeffrey P Shell,
+Klamer Schutte,
 Joel Shprentz,
 Terrel Shumway,
 Nathaniel Smith,
diff --git a/roundup/cgi/client.py b/roundup/cgi/client.py
index eddd31c..c2ccb93 100644
--- a/roundup/cgi/client.py
+++ b/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.131 2003-08-28 01:39:15 richard Exp $
 
 __doc__ = """
 WWW request handler (also used in the stand-alone server).
@@ -995,14 +995,14 @@ You should then receive another email with the new password.
         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 @@ You should then receive another email with the new password.
             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):
diff --git a/templates/classic/html/issue.item.html b/templates/classic/html/issue.item.html
index 751a4d5..0700966 100644
--- a/templates/classic/html/issue.item.html
+++ b/templates/classic/html/issue.item.html
@@ -140,7 +140,8 @@ python:db.user.classhelp('username,realname,address', property='nosy', width='60
     <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>
-- 
2.30.2