Changeset 500

Show
Ignore:
Timestamp:
05/19/06 11:19:53
Author:
douglm
Message:

Temporarily mark attendes and organizers as lazy=false
Need to implement some hibernate interceptor approach
Editiing events works again in admin client.

Fix delete in admin client.

Mark CharArrayWriter? field in Acl as transient. Not serializable

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/EncodedAcl.java

    r2 r500  
    7070  private int pos; 
    7171 
    72   /** When encoding an acl we build it here. 
    73    */ 
    74   private CharArrayWriter caw; 
     72  /* When encoding an acl we build it here. 
     73   */ 
     74  private transient CharArrayWriter caw; 
    7575 
    7676  /** Set an encoded value 

  • trunk/calendar3/calCore/resources/hbms/Event.hbm.xml

    r445 r500  
    8383                 column="organizerid" 
    8484                 unique="true" 
    85                  not-null="false" /> 
     85                 not-null="false" lazy="false" /> 
    8686 
    8787    <many-to-one name="calendar" 
    …… 
    143143 
    144144    <set name="attendees" table="event_attendees" 
    145          cascade="all-delete-orphan" > 
     145         cascade="all-delete-orphan" lazy="false" > 
    146146      <key column="eventid"/> 
    147147      <many-to-many class="org.bedework.calfacade.BwAttendee" /> 

  • trunk/calendar3/calCore/resources/hbms/EventAnnotation.hbm.xml

    r445 r500  
    8787                 class="org.bedework.calfacade.BwOrganizer" 
    8888                 column="organizerid" 
    89                  unique="true"/> 
     89                 unique="true" lazy="false" /> 
    9090 
    9191    <many-to-one name="calendar" 
    …… 
    143143 
    144144    <set name="attendees" table="event_annotation_attendees" 
    145          cascade="all-delete-orphan" > 
     145         cascade="all-delete-orphan" lazy="false" > 
    146146      <key column="attendeeid"/> 
    147147      <many-to-many class="org.bedework.calfacade.BwAttendee" /> 

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

    r55 r500  
    5555package org.bedework.webadmin.event; 
    5656 
     57import org.bedework.calfacade.BwEvent; 
    5758import org.bedework.calsvci.CalSvcI; 
    5859import org.bedework.webadmin.PEAbstractAction; 
    …… 
    101102    } 
    102103 
    103     BwWebUtil.deleteEvent(form, svci.getEvent(eventid).getEvent()); 
     104    BwEvent event = form.getEditEvent(); 
     105 
     106    BwWebUtil.deleteEvent(form, event); 
     107 
     108//    BwWebUtil.deleteEvent(form, svci.getEvent(eventid).getEvent()); 
    104109 
    105110    form.getMsg().emit("org.bedework.client.message.event.deleted");