Changeset 86

Show
Ignore:
Timestamp:
02/05/06 21:51:45
Author:
douglm
Message:

Fix up ordering of views
Change save tp update in a couple of places - perhaps related to duplicate user entries appearing

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r46 r86  
    2424 
    2525    <set name="subscriptions" table="user_subscriptions" lazy="true" 
    26          cascade="all-delete-orphan" > 
     26         cascade="all-delete-orphan" 
     27         sort="natural" > 
    2728      <cache usage="read-write"/> 
    2829      <key column="prefid"/> 
    …… 
    3132 
    3233    <set name="views" table="user_views" lazy="false" 
    33          cascade="all-delete-orphan" > 
     34         cascade="all-delete-orphan" 
     35         sort="natural" > 
    3436      <cache usage="read-write"/> 
    3537      <key column="prefid"/> 

  • trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java

    r55 r86  
    707707    sess.save(usercal); 
    708708 
    709     sess.save(user); 
     709    sess.update(user); 
    710710  } 
    711711 
    …… 
    716716  public void updateUser(BwUser user) throws CalFacadeException { 
    717717    checkOpen(); 
    718     sess.save(user); 
     718    sess.update(user); 
    719719  } 
    720720 
    …… 
    743743    val.setLogon(now); 
    744744    val.setLastAccess(now); 
    745     sess.saveOrUpdate(val); 
     745    sess.update(val); 
    746746  } 
    747747 

  • trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java

    r68 r86  
    14331433            // Assume deleted 
    14341434            sub.setCalendarDeleted(true); 
    1435             getCal().updateUser(getUser()); 
     1435            updateSubscription(sub); 
    14361436          } else { 
    14371437            sub.setCalendar(calendar);