issue2550822: Fix showing more than one additional property in class menu

Report and patch provided by James Mack:
| I had the following option in one of my templates:
| tal:content="structure python:context.propname.menu(additional=
| ['propname1', 'propname2'])"
|
| I expected this to display both propname1 and propname2 in the menu. It
| only displayed propname2.

Author: ThomasAH

CHANGES.txt

@@ -39,6 +39,8 @@ Fixed:
 - executable .py scripts need "#!/usr/bin/env python", add this to demo.py,
   remove exec bits from website/wiki/wiki/data/plugin/theme/roundup.py
   (Thomas Arendsen Hein)
+- issue2550822: Fix showing more than one additional property in class menu
+  (James Mack)
 
 
 2013-07-06: 1.5.0

roundup/cgi/templating.py

@@ -2048,12 +2048,12 @@ 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: cl.get(linkcl.get(optionid,
+                    fn = lambda optionid, propname=propname, labelprop=labelprop: cl.get(linkcl.get(optionid,
                                                             propname),
                                                  labelprop)
                 else:
-                    fn = lambda optionid: linkcl.get(optionid, propname)
-            additional_fns.append(fn)
+                    fn = lambda optionid, propname=propname: linkcl.get(optionid, propname)
+                additional_fns.append(fn)
 
         for optionid in options:
             # get the option value, and if it's None use an empty string