[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.8.8-237-g4d0b7de

[Shawn Moore]

The branch, 3.9-trunk has been updated
       via  4d0b7de5ff74267b875c4c86b8cd1cc661c28151 (commit)
      from  c199554e14e98778329a549111cd277f546b3a56 (commit)

Summary of changes:
 share/html/Widgets/ComboBox |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

- Log -----------------------------------------------------------------
commit 4d0b7de5ff74267b875c4c86b8cd1cc661c28151
Author: Shawn M Moore <sartak at bestpractical.com>
Date:   Tue Aug 10 00:02:54 2010 -0400

    Revert "Allow specifying different label and name for ComboBox values"
    
    This reverts commit 2e71bebadd6703ae50f9c3672eea8987f637da71.
    
    This can't really work given that the point of ComboBoxes is that they
    are editable

diff --git a/share/html/Widgets/ComboBox b/share/html/Widgets/ComboBox
index e8f4f68..44f325e 100644
--- a/share/html/Widgets/ComboBox
+++ b/share/html/Widgets/ComboBox
@@ -59,11 +59,7 @@ my $z_index = 9999;
 <br style="display: none" /><span id="<% $Name %>_Button" class="combo-button">&#9660;</span><select name="List-<% $Name %>" id="<% $Name %>_List" class="combo-list" onchange="ComboBox_SimpleAttach(this, this.form['<% $Name %>']); " size="<% $Rows %>">
 <option style="display: none" value="">-</option>
 % foreach my $value (@Values) {
-%     if (ref($value) eq 'HASH') {
-          <option value="<%$value->{name}%>"><% $value->{label}%></option>
-%     } else {
-          <option value="<%$value%>"><% $value%></option>
-%     }
+        <option value="<%$value%>"><% $value%></option>
 % }
 </select>
 </div>

-----------------------------------------------------------------------