germuska    2004/05/17 12:42:09

  Modified:    src/share/org/apache/struts/taglib/html
                        OptionsCollectionTag.java OptionsTag.java
  Log:
  Filter values as well as labels.
  PR: 28023
  Submitted by: Niall Pemberton
  
  Revision  Changes    Path
  1.17      +9 -5      
jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsCollectionTag.java
  
  Index: OptionsCollectionTag.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsCollectionTag.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- OptionsCollectionTag.java 14 Mar 2004 06:23:46 -0000      1.16
  +++ OptionsCollectionTag.java 17 May 2004 19:42:09 -0000      1.17
  @@ -290,7 +290,11 @@
       protected void addOption(StringBuffer sb, String label, String value, boolean 
matched) {
   
           sb.append("<option value=\"");
  -        sb.append(value);
  +        if (filter) {
  +            sb.append(TagUtils.getInstance().filter(value));
  +        } else {
  +            sb.append(value);
  +        }
           sb.append("\"");
           if (matched) {
               sb.append(" selected=\"selected\"");
  
  
  
  1.29      +8 -4      
jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsTag.java
  
  Index: OptionsTag.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/OptionsTag.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- OptionsTag.java   14 Mar 2004 06:23:46 -0000      1.28
  +++ OptionsTag.java   17 May 2004 19:42:09 -0000      1.29
  @@ -314,7 +314,11 @@
       protected void addOption(StringBuffer sb, String value, String label, boolean 
matched) {
   
           sb.append("<option value=\"");
  -        sb.append(value);
  +        if (filter) {
  +            sb.append(TagUtils.getInstance().filter(value));
  +        } else {
  +            sb.append(value);
  +        }
           sb.append("\"");
           if (matched) {
               sb.append(" selected=\"selected\"");
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to