Changeset 256

Timestamp:

03/03/06 10:39:48

Author:

douglm

Message:

Fix adding loc/sponsor problem

Files:

• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/UserAuthUWDbImpl.java (modified) (1 diff)
• trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (modified) (2 diffs)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/category/PEUpdateCategoryAction.java (modified) (1 diff)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/location/PEUpdateLocationAction.java (modified) (1 diff)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/sponsor/PEUpdateSponsorAction.java (modified) (1 diff)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/calendars/UpdateCalendarAction.java (modified) (1 diff)

trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/UserAuthUWDbImpl.java

@@ -607 +607 @@
-    }
-
-getSess()
+sess
-  }
-

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

@@ -690 +690 @@
-
-  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 */
+        getUserAuth().removeCalendar(null, val);
+      }
+    }
+    
-    getCal().updateCalendar(val);
-  }
@@ -700 +708 @@
-    }
-
-
-
+
+
+
+
-
-    /* Attempt to delete

trunk/calendar3/webadmin/src/org/bedework/webadmin/category/PEUpdateCategoryAction.java

@@ -117 +117 @@
-    }
-
+    form.assignAddingCategory(false);
-//    form.updatePrefs(null, null, null, null);
-

trunk/calendar3/webadmin/src/org/bedework/webadmin/location/PEUpdateLocationAction.java

@@ -127 +127 @@
-    }
-
+    form.assignAddingLocation(false);
-    updateAuthPrefs(form, null, null, loc, null);
-

trunk/calendar3/webadmin/src/org/bedework/webadmin/sponsor/PEUpdateSponsorAction.java

@@ -127 +127 @@
-    }
-
+    form.assignAddingSponsor(false);
-    updateAuthPrefs(form, null, sp, null, null);
-

trunk/calendar3/webcommon/src/org/bedework/webcommon/calendars/UpdateCalendarAction.java

@@ -124 +124 @@
-    }
-
-
+
+
+
-
-    if (add) {