[Bedework-commit] r501 - in trunk/calendar3: calCore/src/org/bedework/calcore/hibernate calsvc/src/org/bedework/calsvc calsvci/src/org/bedework/calsvci

[svnadmin at bedework.org]

Author: douglm
Date: 2006-05-19 14:50:24 -0400 (Fri, 19 May 2006)
New Revision: 501

Modified:
   trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/Calendars.java
   trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java
   trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcI.java
Log:
Fixed updating of calendars

Modified: trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/Calendars.java
===================================================================
--- trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/Calendars.java	2006-05-19 15:19:53 UTC (rev 500)
+++ trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/Calendars.java	2006-05-19 18:50:24 UTC (rev 501)
@@ -391,7 +391,9 @@
   }
 
   public void updateCalendar(BwCalendar val) throws CalFacadeException {
-    access.checkAccess(val, privWrite, false);
+    access.checkAccess(val, privWriteProperties, false);
+    val = (BwCalendar)getSess().merge(val);
+
     getSess().update(val);
   }
 

Modified: trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java
===================================================================
--- trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java	2006-05-19 15:19:53 UTC (rev 500)
+++ trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java	2006-05-19 18:50:24 UTC (rev 501)
@@ -312,8 +312,9 @@
     }
   }
 
-  public void setSuperUser(boolean val) {
+  public void setSuperUser(boolean val) throws CalFacadeException {
     superUser = val;
+    getCal().setSuperUser(val);
   }
 
   public boolean getSuperUser() {

Modified: trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcI.java
===================================================================
--- trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcI.java	2006-05-19 15:19:53 UTC (rev 500)
+++ trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcI.java	2006-05-19 18:50:24 UTC (rev 501)
@@ -111,8 +111,9 @@
   /** Called after init to flag this user as a super user.
    *
    * @param val       true for a super user
+   * @throws CalFacadeException
    */
-  public abstract void setSuperUser(boolean val);
+  public abstract void setSuperUser(boolean val) throws CalFacadeException;
 
   /** Called after init to flag this user as a super user.
    *