Changeset 147

Show
Ignore:
Timestamp:
02/10/06 11:04:02
Author:
douglm
Message:

Allow no subscription in event info - occurs when we select a single event after selecting a celandar from the list

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/webadmin/src/org/bedework/webadmin/event/PEGetFormattedEventsAction.java

    r145 r147  
    6060import org.bedework.calfacade.CalFacadeUtil; 
    6161import org.bedework.calfacade.filter.BwCreatorFilter; 
    62 import org.bedework.calfacade.filter.BwFilter; 
    6362import org.bedework.webadmin.PEAbstractAction; 
    6463import org.bedework.webadmin.PEActionForm; 
    6564import org.bedework.webcommon.BwSession; 
    66  
    6765 
    6866import java.util.Collection; 

  • trunk/calendar3/webclient/war/docs/emitEvent.jsp

    r41 r147  
    77<%-- Output a single event --%> 
    88  <event> 
    9     <subscription> 
    10       <id><bean:write name="eventInfo" property="subscription.id"/></id> 
    11       <affectsFreeBusy><bean:write name="eventInfo" property="subscription.affectsFreeBusy"/></affectsFreeBusy> 
    12       <style><bean:write name="eventInfo" property="subscription.style"/></style> 
    13     </subscription> 
     9    <logic:present  name="event" property="subscription"> 
     10      <subscription> 
     11        <id><bean:write name="eventInfo" property="subscription.id"/></id> 
     12        <affectsFreeBusy><bean:write name="eventInfo" property="subscription.affectsFreeBusy"/></affectsFreeBusy> 
     13        <style><bean:write name="eventInfo" property="subscription.style"/></style> 
     14      </subscription> 
     15    </logic:present> 
     16    <logic:notPresent  name="event" property="subscription"> 
     17      <subscription> 
     18        <id>-1</id> 
     19        <affectsFreeBusy>false</affectsFreeBusy> 
     20        <style></style> 
     21      </subscription> 
     22    </logic:notPresent> 
    1423    <start><%-- start date and time --%> 
    1524      <bean:define id="date" name="eventFmt" 

  • trunk/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java

    r145 r147  
    295295  /** Method to retrieve an event. 
    296296   * <p>Request parameters<ul> 
    297    *      <li>"subid"    subscription id for event.</li> 
     297   *      <li>"subid"    subscription id for event. < 0 if there is none 
     298   *                     e.g. displayed directly from calendar.</li> 
    298299   *      <li>"guid"     guid of event.</li> 
    299300   *      <li>"recurrenceId"   recurrence-id of event instance - possibly null.</li> 
    …… 
    309310  protected EventInfo findEvent(HttpServletRequest request, 
    310311                                BwActionFormBase form) throws Throwable { 
     312    CalSvcI svci = form.fetchSvci(); 
    311313    EventInfo ev = null; 
    312  
    313     /* XXX temp set up subscription here - we'll pass it to svci later 
    314      */ 
     314    BwSubscription sub = null; 
     315 
    315316    int subid = getIntReqPar(request, "subid", -1); 
    316     if (subid < 0) { 
    317       form.getErr().emit("org.bedework.client.error.missingsubscriptionid"); 
    318       return null; 
    319     } 
    320  
    321     CalSvcI svci = form.fetchSvci(); 
    322  
    323     BwSubscription sub = svci.getSubscription(subid); 
    324  
    325     if (sub == null) { 
    326       form.getErr().emit("org.bedework.client.error.missingsubscriptionid"); 
    327       return null; 
     317    if (subid >= 0) { 
     318      sub = svci.getSubscription(subid); 
     319 
     320      if (sub == null) { 
     321        form.getErr().emit("org.bedework.client.error.missingsubscriptionid"); 
     322        return null; 
     323      } 
    328324    } 
    329325