fixed issue2550993 and added test case

Author: cmeerw

CHANGES.txt

@@ -32,7 +32,10 @@ Fixed:
   selecting columns to display in the issues list (Christof Meerwald)
 - issue2550988: fixed fallback to pseudo random number generator in
   case SystemRandom isn't available, prefer use of secrets module if
-  available (Python 3.6+)
+  available (Python 3.6+) (Christof Meerwald)
+- issue2550993: fixed edit CSV action to update restored items to the
+  new value instead of restoring with the previous value (Christof
+  Meerwald)
 
 
 2018-07-13 1.6.0

roundup/cgi/actions.py

@@ -504,7 +504,7 @@ def handle(self):
                 # If a CSV line just mentions an id and the corresponding
                 # item is retired, then the item is restored.
                 cl.restore(itemid)
-                continue
+                exists = 1
             else:
                 exists = 1
 

test/test_cgi.py

@@ -1349,6 +1349,36 @@ def testEditCSV(self):
         k = self.db.keyword.getnode('1')
         self.assertEqual(k.name, u2s(u'\xe4\xf6\xfc'))
 
+    def testEditCSVRestore(self):
+        form = dict(rows='id,name\n1,key1\n2,key2')
+        cl = self._make_client(form, userid='1', classname='keyword')
+        cl._ok_message = []
+        actions.EditCSVAction(cl).handle()
+        self.assertEqual(cl._ok_message, ['Items edited OK'])
+        k = self.db.keyword.getnode('1')
+        self.assertEqual(k.name, 'key1')
+        k = self.db.keyword.getnode('2')
+        self.assertEqual(k.name, 'key2')
+
+        form = dict(rows='id,name\n1,key1')
+        cl = self._make_client(form, userid='1', classname='keyword')
+        cl._ok_message = []
+        actions.EditCSVAction(cl).handle()
+        self.assertEqual(cl._ok_message, ['Items edited OK'])
+        k = self.db.keyword.getnode('1')
+        self.assertEqual(k.name, 'key1')
+        self.assertEqual(self.db.keyword.is_retired('2'), True)
+
+        form = dict(rows='id,name\n1,newkey1\n2,newkey2')
+        cl = self._make_client(form, userid='1', classname='keyword')
+        cl._ok_message = []
+        actions.EditCSVAction(cl).handle()
+        self.assertEqual(cl._ok_message, ['Items edited OK'])
+        k = self.db.keyword.getnode('1')
+        self.assertEqual(k.name, 'newkey1')
+        k = self.db.keyword.getnode('2')
+        self.assertEqual(k.name, 'newkey2')
+
     def testserve_static_files(self):
         # make a client instance
         cl = self._make_client({})