Changeset 2225

Show
Ignore:
Timestamp:
06/05/09 13:03:34
Author:
johnsa
Message:

admin client: fix up reject event email messaging

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2212 r2225  
    361361                      /bedework/page='eventList'"> 
    362362          <script type="text/javascript" src="{$resourcesRoot}/resources/bedework.js">&#160;</script> 
     363          <script type="text/javascript" src="{$resourcesRoot}/resources/bedeworkEventForm.js">&#160;</script> 
    363364          <script type="text/javascript" src="/bedework-common/javascript/bedework/bedeworkUtil.js">&#160;</script> 
    364365        </xsl:if> 
    …… 
    31073108              <xsl:when test="/bedework/page = 'deleteEventConfirmPending'"> 
    31083109                <xsl:attribute name="action"><xsl:value-of select="$event-deletePending"/></xsl:attribute> 
    3109                 <xsl:attribute name="onsubmit">doRejectMessage(this,<xsl:value-of select="summary"/>,<xsl:value-of select="$eventDatesForEmail"/>);</xsl:attribute> 
     3110                <xsl:attribute name="onsubmit">doRejectEvent(this,'<xsl:value-of select="summary"/>','<xsl:value-of select="$eventDatesForEmail"/>');</xsl:attribute> 
    31103111                <!-- Setup email notification fields --> 
    3111                 <input type="hidden" id="submitNotification" name="submitNotification" value="false"/> 
     3112                <input type="hidden" id="submitNotification" name="submitNotification" value="true"/> 
    31123113                <!-- "from" should be a preference: hard code it for now --> 
    31133114                <input type="hidden" id="snfrom" name="snfrom" value="bedework@yoursite.edu"/> 

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

    r2201 r2225  
    759759  message = "Your event has been rejected.\n\n"; 
    760760  message += "EVENT DETAILS\n-------------\n"; 
    761   message = "Event Title: " + eventTitle + "\n"; 
    762   message = "Event Dates: " + eventDatesForEmail + "\n\n\n"; 
    763   if (trim(formObj.reason) != '') { 
     761  message += "Event Title: " + eventTitle + "\n"; 
     762  message += "Event Dates: " + eventDatesForEmail + "\n\n\n"; 
     763  if (trim(formObj.reason.value) != '') { 
    764764    message += "Reason:\n"; 
    765     message += formObj.reason; 
     765    message += formObj.reason.value; 
    766766  } 
    767767  formObj.sntext.value = message;