Changeset 402

Timestamp:

04/20/06 16:00:56

Author:

douglm

Message:

Allow change of calendar in event

Files:

• trunk/calendar3/webclient/src/org/bedework/webclient/BwAddEventAction.java (modified) (2 diffs)
• trunk/calendar3/webclient/src/org/bedework/webclient/BwEditEventAction.java (modified) (1 diff)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java (modified) (1 diff)

trunk/calendar3/webclient/src/org/bedework/webclient/BwAddEventAction.java

@@ -52 +52 @@
-    to the maximum extent the law permits.
-*/
-
-package org.bedework.webclient;
-
-import org.bedework.calfacade.BwCalendar;
-import org.bedework.calfacade.BwEvent;
-import org.bedework.calfacade.BwLocation;
-import org.bedework.calfacade.CalFacadeDefs;
-import org.bedework.calfacade.svc.BwSubscription;
-import org.bedework.calsvci.CalSvcI;
-import org.bedework.webcommon.BwWebUtil;
@@ -97 +94 @@
-
-    CalSvcI svci = form.fetchSvci();
-    BwSubscription sub = null;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    }
-

trunk/calendar3/webclient/src/org/bedework/webclient/BwEditEventAction.java

@@ -156 +156 @@
-    BwEvent ev = form.getEditEvent();
-
+    String fwd = setEventCalendar(request, form, ev);
+    if (fwd != null) {
+      return fwd;
+    }
+
-    if (!form.getEventDates().updateEvent(ev, svci.getTimezones()) ||
-        !BwWebUtil.validateEvent(svci, ev, false, //  descriptionRequired

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

@@ -381 +381 @@
-  }
-
+  protected String setEventCalendar(HttpServletRequest request,
+                                    BwActionFormBase form,
+                                    BwEvent ev) throws Throwable {
+    CalSvcI svci = form.fetchSvci();
+    BwSubscription sub = null;
+
+    if (!findSubscribedCalendar(request, form, false)) {
+      // No subscription specified. Was a calendar specified
+      int id = getIntReqPar(request, "calId", -1);
+
+      if (id < 0) {
+        ev.setCalendar(svci.getPreferredCalendar());
+      } else {
+        BwCalendar calendar = svci.getCalendar(id);
+
+        if (calendar == null) {
+          form.getErr().emit("org.bedework.client.error.nosuchcalendar", id);
+          return "notFound";
+        }
+
+        ev.setCalendar(calendar);
+      }
+    } else {
+      sub = form.getSubscription();
+      if ((sub != null) && (!sub.getInternalSubscription())) {
+        // XXX more work for external subscriptions here
+        return "doNothing";
+      } else {
+        // XXX disallow use of subscription.
+        return "doNothing";
+      }
+    }
+
+    return null;  // OK return
+  }
+
-  /** Method to retrieve an event. An event is identified by the calendar +
-   * guid + recurrence id. We also take the subscription id as a parameter so