cvs commit: jakarta-struts/src/share/org/apache/struts/taglib/html JavascriptValidatorTag.java

[husted]

husted      2004/06/30 17:40:24

  Modified:    src/share/org/apache/struts/taglib/html
                        JavascriptValidatorTag.java
  Log:
  Apply #29796 "<html:javascript>  generates bad js method id's with ActionValidator 
Form" submitted by Joe Hertz,  Ernie Argetsinger, and Matt Bathje.
  
  Revision  Changes    Path
  1.51      +47 -10    
jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java
  
  Index: JavascriptValidatorTag.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/JavascriptValidatorTag.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- JavascriptValidatorTag.java       14 Mar 2004 06:23:46 -0000      1.50
  +++ JavascriptValidatorTag.java       1 Jul 2004 00:40:24 -0000       1.51
  @@ -41,6 +41,7 @@
   import org.apache.commons.validator.util.ValidatorUtils;
   import org.apache.commons.validator.Var;
   import org.apache.struts.Globals;
  +import org.apache.struts.action.ActionMapping;
   import org.apache.struts.config.ModuleConfig;
   import org.apache.struts.taglib.TagUtils;
   import org.apache.struts.util.MessageResources;
  @@ -118,6 +119,15 @@
        * &lt;script&gt; &lt;/script&gt; around the javascript.
        */
       protected String formName = null;
  +    
  +    /**
  +     * formName is used for both Javascript and non-javascript validations.
  +     * For the javascript validations, there is the possibility that we will
  +     * be rewriting the formName (if it is a ValidatorActionForm instead of just
  +     * a ValidatorForm) so we need another variable to hold the formName just for
  +     * javascript usage.
  +     */
  +    protected String jsFormName = null;
   
       /**
        * The line ending string.
  @@ -190,6 +200,18 @@
           this.formName = formName;
       }
   
  +     /**
  +      * @return Returns the jsFormName.
  +      */
  +     public String getJsFormName() {
  +             return jsFormName;
  +     }
  +     /**
  +      * @param jsFormName The jsFormName to set.
  +      */
  +     public void setJsFormName(String jsFormName) {
  +             this.jsFormName = jsFormName;
  +     }
       /**
        * Gets the current page number of a multi-part form.
        * Only field validations with a matching page numer
  @@ -384,7 +406,7 @@
           ModuleConfig config,
           ValidatorResources resources,
           Locale locale,
  -        Form form) {
  +        Form form) throws JspException {
   
           StringBuffer results = new StringBuffer();
   
  @@ -396,6 +418,20 @@
           List actions = this.createActionList(resources, form);
   
           final String methods = this.createMethods(actions, 
this.stopOnError(config));
  +
  +        String formName = form.getName();
  +        jsFormName = formName;
  +                if(jsFormName.charAt(0) == '/') {
  +                     String mappingName = 
TagUtils.getInstance().getActionMappingName(jsFormName);
  +                     ActionMapping mapping = (ActionMapping) 
config.findActionConfig(mappingName);
  +                    if (mapping == null) {
  +                        JspException e = new 
JspException(messages.getMessage("formTag.mapping", mappingName));
  +                        pageContext.setAttribute(Globals.EXCEPTION_KEY, e, 
PageContext.REQUEST_SCOPE);
  +                        throw e;
  +                    }
  +                    jsFormName = mapping.getAttribute();
  +                }
  +        
           results.append(this.getJavascriptBegin(methods));
   
           for (Iterator i = actions.iterator(); i.hasNext();) {
  @@ -411,8 +447,8 @@
                   functionName = va.getName();
               }
   
  -            String formName = form.getName();
  -            results.append("    function " + formName + "_" + functionName + " () { 
\n");
  +            
  +            results.append("    function " + jsFormName + "_" + functionName + " () 
{ \n");
               for (Iterator x = form.getFields().iterator(); x.hasNext();) {
                   Field field = (Field) x.next();
   
  @@ -628,6 +664,7 @@
           super.release();
           bundle = Globals.MESSAGES_KEY;
           formName = null;
  +        jsFormName = null;
           page = 0;
           methodName = null;
           staticJavascript = "true";
  @@ -642,10 +679,10 @@
        */
       protected String getJavascriptBegin(String methods) {
           StringBuffer sb = new StringBuffer();
  -        String name = formName.replace('/', '_'); // remove any '/' characters
  +        String name = jsFormName.replace('/', '_'); // remove any '/' characters
           name =
  -            formName.substring(0, 1).toUpperCase()
  -                + formName.substring(1, formName.length());
  +            jsFormName.substring(0, 1).toUpperCase()
  +                + jsFormName.substring(1, jsFormName.length());
   
           sb.append(this.renderStartElement());
   
  
  
  

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