Fix arguments to 'menu cgi method

This would not work if more than one additional argument was used.

Author: schlatterbeck

CHANGES.txt

@@ -42,6 +42,9 @@ Fixed:
 - issue2550757: one bug raised by issue fixed. Patch created by
   W. Trevor King (wking) for documentation of mailgw applied by 
   John Rouillard.
+- Fix processing of additional arguments to cgi method 'menu': This
+  would not work if more than one additional argument is used.
+  (Ralf Schlatterbeck)
 
 2016-01-11: 1.5.1
 

roundup/cgi/templating.py

@@ -2073,11 +2073,11 @@ def menu(self, size=None, height=None, showid=0, additional=[], value=None,
                 if isinstance(prop, hyperdb.Link):
                     cl = self._db.getclass(prop.classname)
                     labelprop = cl.labelprop()
-                    fn = lambda optionid, \
+                    fn = lambda optionid, cl=cl, linkcl=linkcl, \
                                 propname=propname, labelprop=labelprop: \
                             cl.get(linkcl.get(optionid, propname), labelprop)
                 else:
-                    fn = lambda optionid, propname=propname: \
+                    fn = lambda optionid, linkcl=linkcl, propname=propname: \
                             linkcl.get(optionid, propname)
                 additional_fns.append(fn)
 
@@ -2306,11 +2306,11 @@ def menu(self, size=None, height=None, showid=0, additional=[],
                 if isinstance(prop, hyperdb.Link):
                     cl = self._db.getclass(prop.classname)
                     labelprop = cl.labelprop()
-                    fn = lambda optionid, \
+                    fn = lambda optionid, cl=cl, linkcl=linkcl, \
                                 propname=propname, labelprop=labelprop: \
                             cl.get(linkcl.get(optionid, propname), labelprop)
                 else:
-                    fn = lambda optionid, propname=propname: \
+                    fn = lambda optionid, linkcl=linkcl, propname=propname: \
                             linkcl.get(optionid, propname)
                 additional_fns.append(fn)