merge from upstream.

Author: rouilj

CHANGES.txt

@@ -156,6 +156,10 @@ Features:
   field. This allows onchange javascript to trigger to highlight
   changes, recalculate other form values etc.  See ``upgrading.txt``
   for details on applying these changes to your tracker. (John Rouillard)
+- menu template function has a new parameter "showdef". When set to a
+  string, the string is appended to the displayed option value. This
+  allows the user to reset the value for the menu (select) to the
+  original value. (John Rouillard)
 
 Fixed:
 

roundup/cgi/templating.py

@@ -2053,7 +2053,7 @@ def field(self, showid=0, size=None, **kwargs):
                           **kwargs)
 
     def menu(self, size=None, height=None, showid=0, additional=[], value=None,
-             sort_on=None, html_kwargs={}, translate=True, **conditions):
+             sort_on=None, html_kwargs={}, translate=True, showdef=None, **conditions):
         """ Render a form select list for this property
 
             "size" is used to limit the length of the list labels
@@ -2071,6 +2071,11 @@ def menu(self, size=None, height=None, showid=0, additional=[], value=None,
             "translate" indicates if we should do translation of labels
             using gettext -- this is often desired (e.g. for status
             labels) but sometimes not.
+            "showdef" marks the default value with the string passed
+                as the showdef argument. It is appended to the selected
+                value so the user can reset the menu to the original value.
+                Note that the marker may be removed if the length of
+                the option label and the marker exceed the size.
 
             The remaining keyword arguments are used as conditions for
             filtering the items in the list - they're passed as the
@@ -2139,8 +2144,13 @@ def menu(self, size=None, height=None, showid=0, additional=[], value=None,
 
             # figure if this option is selected
             s = ''
+            # record the marker for the selected item if requested
+            selected_mark=''
+
             if value in [optionid, option]:
                 s = 'selected="selected" '
+                if ( showdef ):
+                    selected_mark = showdef
 
             # figure the label
             if showid:
@@ -2150,6 +2160,7 @@ def menu(self, size=None, height=None, showid=0, additional=[], value=None,
             else:
                 lab = option
 
+            lab = lab + selected_mark
             # truncate if it's too long
             if size is not None and len(lab) > size:
                 lab = lab[:size-3] + '...'