Fix linking of an existing item to a newly created item...

...e.g.  edit action in web template is name="issue-1@link@msg"
value="msg1" would trigger a traceback about an unbound variable.  Add
new regression test for this case.

Author: Ralf Schlatterbeck

CHANGES.txt

@@ -36,7 +36,10 @@ Fixes:
 - Fix styling of calendar to make it more usable, fixes issue2550608
 - Fix typo in email section of user guide, fixes issue2550607
 - Fix WSGI response code (thanks Peter P�ml)
-
+- Fix linking of an existing item to a newly created item, e.g.
+  edit action in web template is name="issue-1@link@msg" value="msg1"
+  would trigger a traceback about an unbound variable.
+  Add new regression test for this case.
 
 2009-10-09 1.4.10 (r4374)
 

roundup/cgi/actions.py

@@ -478,17 +478,17 @@ def _editnodes(self, all_props, all_links):
                         if linkid is None or linkid.startswith('-'):
                             # linking to a new item
                             if isinstance(propdef, hyperdb.Multilink):
-                                props[linkprop] = [newid]
+                                props[linkprop] = [nodeid]
                             else:
-                                props[linkprop] = newid
+                                props[linkprop] = nodeid
                         else:
                             # linking to an existing item
                             if isinstance(propdef, hyperdb.Multilink):
                                 existing = cl.get(linkid, linkprop)[:]
                                 existing.append(nodeid)
                                 props[linkprop] = existing
                             else:
-                                props[linkprop] = newid
+                                props[linkprop] = nodeid
 
         return '<br>'.join(m)
 

test/test_actions.py

@@ -249,6 +249,7 @@ def __call__(inner_self, *args, **kw):
             ({'messages':hyperdb.Multilink('msg')
              ,'content':hyperdb.String()
              ,'files':hyperdb.Multilink('file')
+             ,'msg':hyperdb.Link('msg')
              })
         self.action = EditItemAction(self.client)
 
@@ -302,6 +303,19 @@ def testLinkExisting(self):
             pass
         self.assertEqual(expect, self.result)
 
+    def testLinkNewToExisting(self):
+        expect = [('create',(),{'msg':'1','title':'TEST'})]
+        self.client.db.classes.get = lambda a, b:['23','42']
+        self.client.parsePropsFromForm = lambda: \
+            ( {('issue','-1'):{'title':'TEST'},('msg','1'):{}}
+            , [('issue','-1','msg',[('msg','1')])]
+            )
+        try :
+            self.action.handle()
+        except Redirect, msg:
+            pass
+        self.assertEqual(expect, self.result)
+
 def test_suite():
     suite = unittest.TestSuite()
     suite.addTest(unittest.makeSuite(RetireActionTestCase))