Changeset 1245

Show
Ignore:
Timestamp:
01/22/07 01:22:37
Author:
johnsa
Message:

user and admin web clients:

- correctly set recurrence until date

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r1243 r1245  
    12601260                        <xsl:when test="form/recurrence/count = '-1'">forever</xsl:when> 
    12611261                        <xsl:when test="form/recurrence/until"> 
    1262                           <xsl:value-of select="form/recurrence/until"/> 
     1262                          until <xsl:value-of select="substring(form/recurrence/until,1,4)"/>-<xsl:value-of select="substring(form/recurrence/until,5,2)"/>-<xsl:value-of select="substring(form/recurrence/until,7,2)"/> 
    12631263                        </xsl:when> 
    12641264                        <xsl:otherwise> 

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

    r1237 r1245  
    311311        break; 
    312312      case "until": 
    313         formObj.until.value = dojo.widget.byId("bwEventWidgetUntilDate").getVal();; 
     313        // the following will not be adequate for recurrences smaller than a day; 
     314        // we will need to set the time properly at that point. 
     315        formObj.until.value = dojo.widget.byId("bwEventWidgetUntilDate").getValue() + "T000000"; 
    314316        break; 
    315317    } 

  • trunk/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

    r1244 r1245  
    24912491                  <xsl:when test="form/recurrence/count = '-1'">forever</xsl:when> 
    24922492                  <xsl:when test="form/recurrence/until"> 
    2493                     <xsl:value-of select="form/recurrence/until"/> 
     2493                    until <xsl:value-of select="substring(form/recurrence/until,1,4)"/>-<xsl:value-of select="substring(form/recurrence/until,5,2)"/>-<xsl:value-of select="substring(form/recurrence/until,7,2)"/> 
    24942494                  </xsl:when> 
    24952495                  <xsl:otherwise> 

  • trunk/deployment/webuser/webapp/resources/demoskins/resources/bedeworkEventForm.js

    r1237 r1245  
    311311        break; 
    312312      case "until": 
    313         formObj.until.value = dojo.widget.byId("bwEventWidgetUntilDate").getVal();; 
     313        // the following will not be adequate for recurrences smaller than a day 
     314        // we will need to set the time properly at that point. 
     315        formObj.until.value = dojo.widget.byId("bwEventWidgetUntilDate").getValue() + "T000000"; 
    314316        break; 
    315317    }