Changeset 3590

Show
Ignore:
Timestamp:
07/23/12 23:03:09
Author:
johnsa
Message:

admin web client: improve validation code used for registerable events

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

    r3589 r3590  
    410410            </xsl:otherwise> 
    411411          </xsl:choose> 
     412          <script type="text/javascript" src="/bedework-common/javascript/bedework/bedeworkUtil.js">&#160;</script> 
    412413          <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkEventForm.js">&#160;</script> 
    413414          <script type="text/javascript" src="/bedework-common/javascript/bedework/bedeworkXProperties.js">&#160;</script> 
    …… 
    14291430      </xsl:choose> 
    14301431    </xsl:variable> 
    1431     <form name="eventForm" method="post" enctype="multipart/form-data" onsubmit="setEventFields(this,{$portalFriendly},'{$submitter}');return validateEventForm(this);"> 
     1432    <form name="eventForm" method="post" enctype="multipart/form-data" onsubmit="return setEventFields(this,{$portalFriendly},'{$submitter}')"> 
    14321433      <xsl:choose> 
    14331434        <xsl:when test="/bedework/page = 'modEventPending'"> 

  • trunk/deployment/webadmin/webapp/resources/resources/bedeworkEventForm.js

    r3588 r3590  
    321321 
    322322function setEventFields(formObj,portalFriendly,submitter) { 
     323  if (!validateEventForm(formObj)) { 
     324    return false;  
     325  } 
    323326  if (!portalFriendly) { 
    324327    setDates(formObj); 
    …… 
    328331  } // else we are editing an instance of a recurrence 
    329332  setBedeworkXProperties(formObj,submitter); 
     333  return true; 
    330334} 
    331335 
    …… 
    333337function validateEventForm(formObj) { 
    334338  if(formObj["bwIsRegisterableEvent"].checked) { 
    335      if(formObj["xBwMaxTicketsHolder"].value == "") { 
    336         alert(maxTicketsWarning); 
    337         formObj["xBwMaxTicketsHolder"].focus(); 
    338         return false; 
    339      } 
    340      if(formObj["xBwMaxTicketsPerUserHolder"].value == "") { 
    341        alert(maxTicketsPerUserWarning); 
    342        formObj["xBwMaxTicketsPerUserHolder"].focus(); 
    343        return false; 
     339    var maxTickets = trim(formObj["xBwMaxTicketsHolder"].value); 
     340    var maxTicketsPerUser = trim(formObj["xBwMaxTicketsPerUserHolder"].value); 
     341    if(maxTickets == "" || isNaN(maxTickets)) { 
     342      alert(maxTicketsWarning); 
     343      formObj["xBwMaxTicketsHolder"].focus(); 
     344      return false; 
     345    } 
     346    if(maxTicketsPerUser == "" || isNaN(maxTicketsPerUser)) { 
     347      alert(maxTicketsPerUserWarning); 
     348      formObj["xBwMaxTicketsPerUserHolder"].focus(); 
     349      return false; 
    344350    } 
    345351  } 
    …… 
    409415function hour24ToAmpm(val) { 
    410416  var hour = parseInt(val,10); 
    411   if (hour = 0) { 
     417  if (hour == 0) { 
    412418    return "12"; 
    413419  } else if (hour < 10) {