Changeset 585

Timestamp:

06/14/06 09:29:21

Author:

douglm

Message:

We were picking up the wrong preferences when manipulating subscriptions and view in the admin client.

Files:

• trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (modified) (2 diffs)
• trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcI.java (modified) (1 diff)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java (modified) (4 diffs)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/subs/EndSubscribeAction.java (modified) (1 diff)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/subs/GetSubscriptionsAction.java (modified) (2 diffs)

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

@@ -1072 +1072 @@
-  }
-
+  public Collection getSubscriptions(BwUser user) throws CalFacadeException {
+    Collection c = getUserPrefs(user).getSubscriptions();
+
+    Iterator it = c.iterator();
+    while (it.hasNext()) {
+      BwSubscription sub = (BwSubscription)it.next();
+
+      getSubCalendar(sub);
+    }
+
+    return c;
+  }
+
-  public BwSubscription getSubscription(int id) throws CalFacadeException {
-    return dbi.getSubscription(id);
@@ -2447 +2460 @@
-         */
-        dbi.close();
-
+
+
+
+
+
+
+
+
+
-        dbi = new CalSvcDb(this, user);
-      }

trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcI.java

@@ -855 +855 @@
-  public abstract Collection getSubscriptions() throws CalFacadeException;
-
+  /** Get the given users subscription.
+   *
+   * @param user     BwUser
+   * @return Collection of subscriptions
+   * @throws CalFacadeException
+   */
+  public abstract Collection getSubscriptions(BwUser user) throws CalFacadeException;
+
-  /** Fetch the subscription from the db given an id
-   *

trunk/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java

@@ -54 +54 @@
-package org.bedework.webcommon;
-
-// I only need this because request.getInitParameterNames doesn't work
-import org.bedework.appcommon.BedeworkDefs;
-import org.bedework.calenv.CalEnv;
@@ -231 +230 @@
-    }
-
-/* Set up or refresh frequently used information,
-*/
-CalSvcI svc = form.fetchSvci();
-
-form.setSubscriptions(svc.getSubscriptions());
+if (!getPublicAdmin(form)) {
+ /* Set up or refresh frequently used information,
+   */
+
+}
-
-    try {
@@ -246 +245 @@
-    } catch (CalFacadeAccessException cfae) {
-      form.getErr().emit("org.bedework.client.error.noaccess", "for that action");
-a
+A
-    } catch (Throwable t) {
-      form.getErr().emit("org.bedework.client.error.exc", t.getMessage());
@@ -573 +572 @@
-    }
-
-form.setSubscriptions(svc.getSubscriptions()
+getSubscriptions(form
-
-    return result;
+  }
+
+  /** Implant current subscriptions in the form.
+   *
+   * @param form
+   * @throws Throwable
+   */
+  public void getSubscriptions(BwActionFormBase form) throws Throwable {
+    CalSvcI svc = form.fetchSvci();
+    Collection subs = svc.getSubscriptions();
+    form.setSubscriptions(subs);
-  }
-

trunk/calendar3/webcommon/src/org/bedework/webcommon/subs/EndSubscribeAction.java

@@ -169 +169 @@
-
-    /* Refetch to tidy up */
-form.setSubscriptions(svc.getSubscriptions()
+getSubscriptions(form
-
-    return forwardSuccess;

trunk/calendar3/webcommon/src/org/bedework/webcommon/subs/GetSubscriptionsAction.java

@@ -68 +68 @@
- *
- * @author Mike Douglass   douglm@rpi.edu
- *
- * @deprecated  Probably don't need this. Abstract action always sets the subscriptions.
- */
-public class GetSubscriptionsAction extends BwAbstractAction {
@@ -79 +77 @@
-                         BwSession sess,
-                         BwActionFormBase form) throws Throwable {
-
-
-
+
-
-    return "success";