Changeset 480

Show
Ignore:
Timestamp:
05/15/06 15:43:33
Author:
douglm
Message:

Fix free/busy day bug

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/calendar3/deployment/build.xml

    r463 r480  
    171171  </target> 
    172172 
    173   <target name="deploy.shellscr.apps" if="org.bedework.global.build.standalone.app" > 
     173  <target name="deploy.portal.apps" if="org.bedework.global.portal.platform" > 
     174    <property name="org.bedework.deploy.kind" 
     175              value="${org.bedework.global.portal.platform}" /> 
     176    <antcall target="deploy.apps" inheritrefs="true" /> 
     177  </target> 
     178 
     179  <target name="deploy.j2ee.apps" if="org.bedework.global.j2ee.platform" > 
     180    <property name="org.bedework.deploy.kind" 
     181              value="${org.bedework.global.j2ee.platform}" /> 
     182    <antcall target="deploy.apps" inheritrefs="true" /> 
     183  </target> 
     184 
     185  <!-- Always build the shellscr stuff. --> 
     186  <target name="deploy.shellscr.apps" > 
    174187    <property name="org.bedework.deploy.kind" value="shellscr" /> 
    175     <antcall target="deploy.apps" inheritrefs="true" /> 
    176   </target> 
    177  
    178   <target name="deploy.portal.apps" if="org.bedework.global.portal.platform" > 
    179     <property name="org.bedework.deploy.kind" 
    180               value="${org.bedework.global.portal.platform}" /> 
    181     <antcall target="deploy.apps" inheritrefs="true" /> 
    182   </target> 
    183  
    184   <target name="deploy.j2ee.apps" if="org.bedework.global.j2ee.platform" > 
    185     <property name="org.bedework.deploy.kind" 
    186               value="${org.bedework.global.j2ee.platform}" /> 
    187188    <antcall target="deploy.apps" inheritrefs="true" /> 
    188189  </target> 
  • trunk/calendar3/webclient/src/org/bedework/webclient/BwFreeBusyAction.java

    r407 r480  
    138138 
    139139      scal = tv.getFirstDay(); 
     140      Locale loc = scal.getCalInfo().getLocale();  // XXX Locale 
     141 
     142      /* Essentially clone so that thbe calculations below don't mess up 
     143       * the time view. 
     144       */ 
     145      scal = new MyCalendarVO(scal.getTime(), loc); 
    140146      start = scal.getCalendar(); 
    141147      end = tv.getLastDay().getTomorrow().getCalendar(); 
  • trunk/calendar3/webclient/src/org/bedework/webclient/BwInitEventAction.java

    r419 r480  
    6969 *                                   as yymmdd or yymmddTHHmmss</li> 
    7070 *      <li>"minutes"                Optional duration in minutes</li> 
    71  *      <li>  subname:   Name of a subscription to an external calendar</li>. 
    72  *      <li>  calPath:   Path to a (writeable) calendar collection</li>. 
     71 *      <li>  subname:               Name of a subscription to an external calendar</li>. 
     72 *      <li>  newCalPath:            Path to a (writeable) calendar collection</li>. 
    7373 * </ul> 
    7474 *