[Bedework-commit] calendarapi r290 - releases/bedework-3.3.1/calsvc/src/org/bedework/calsvc

[svnadmin at bedework.org]

Author: douglm
Date: 2007-05-17 14:13:40 -0400 (Thu, 17 May 2007)
New Revision: 290

Modified:
   releases/bedework-3.3.1/calsvc/src/org/bedework/calsvc/CalSvc.java
Log:
Update prefs correctly when deleting calendar

Modified: releases/bedework-3.3.1/calsvc/src/org/bedework/calsvc/CalSvc.java
===================================================================
--- releases/bedework-3.3.1/calsvc/src/org/bedework/calsvc/CalSvc.java	2007-05-17 18:13:12 UTC (rev 289)
+++ releases/bedework-3.3.1/calsvc/src/org/bedework/calsvc/CalSvc.java	2007-05-17 18:13:40 UTC (rev 290)
@@ -103,7 +103,6 @@
 import org.bedework.calfacade.svc.BwView;
 import org.bedework.calfacade.svc.EventInfo;
 import org.bedework.calfacade.svc.UserAuth;
-import org.bedework.calfacade.svc.prefs.BwAuthUserPrefs;
 import org.bedework.calfacade.svc.prefs.BwCommonUserPrefs;
 import org.bedework.calfacade.svc.prefs.BwPreferences;
 import org.bedework.calfacade.svc.prefs.CalendarPref;
@@ -1068,17 +1067,12 @@
    * @see org.bedework.calsvci.CalSvcI#updateCalendar(org.bedework.calfacade.BwCalendar)
    */
   public void updateCalendar(BwCalendar val) throws CalFacadeException {
-    // Ensure it's not in prefs if it's a folder
-    if (!val.getCalendarCollection()) {
-      if (pars.getPublicAdmin()) {
-        /* Remove from preferences */
-        BwAuthUser au = getUserAuth().getUser(getUser());
-        BwAuthUserPrefs authPrefs = au.getPrefs();
-        CalendarPref p = authPrefs.getCalendarPrefs();
-        if (p.remove(val)) {
-          getUserAuth().updatePrefs(au);
-        }
-      }
+    /* Ensure it's not in admin prefs if it's a folder.
+     * User may have switched from calendar to folder.
+     */
+    if (!val.getCalendarCollection() && pars.getPublicAdmin()) {
+      /* Remove from preferences */
+      updatePrefs(true, val, null, null, null);
     }
 
     if (indexing) {