Changeset 487

Timestamp:

05/16/06 16:01:01

Author:

douglm

Message:

Subscriptions to other users calendars now work

Files:

• trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (modified) (1 diff)
• trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl (modified) (4 diffs)
• trunk/calendar3/webclient/war/WEB-INF/struts-config.xml (modified) (3 diffs)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java (modified) (3 diffs)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/subs/EndSubscribeAction.java (moved) (moved from trunk/calendar3/webcommon/src/org/bedework/webcommon/subs/SubscribeAction.java) (4 diffs)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/subs/InitSubscribeAction.java (modified) (3 diffs)

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

@@ -2043 +2043 @@
-      // Assume deleted
-      val.setCalendarDeleted(true);
-
+
+
+
+
-    } else {
-      val.setCalendar(calendar);

trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl

@@ -2927 +2927 @@
-    <h3>Add Subscription to User Calendar</h3>
-    <p class="note">*the subsciption name must be unique</p>
-subscribe
+initAdd
-      <table class="common" cellspacing="0">
-        <tr>
-          <td class="fieldname">Name:</td>
-          <td>
-subscription.
+
-          </td>
-        </tr>
@@ -2960 +2960 @@
-          <td class="fieldname">Display:</td>
-          <td>
-subscription.
-subscription.
+
+
-          </td>
-        </tr>
@@ -2967 +2967 @@
-          <td class="fieldname">Affects Free/Busy:</td>
-          <td>
-subscription.
-subscription.
+
+
-          </td>
-        </tr>
@@ -2974 +2974 @@
-          <td class="fieldname">Style:</td>
-          <td>
-ubscription.s
+
-          </td>
-        </tr>

trunk/calendar3/webclient/war/WEB-INF/struts-config.xml

@@ -629 +629 @@
-      <forward name="noAccess" path="/subs/showSubs.rdo" redirect="true"/>
-      <forward name="cancelled" path="/subs/showSubs.rdo" redirect="true"/>
+      <forward name="added" path="/subs/showModForm.rdo" redirect="true" />
-      <forward name="success" path="/subs/showModForm.rdo" redirect="true" />
-    </action>
@@ -642 +643 @@
-
-    <action    path="/subs/subscribe"
-
+End
-               name="calForm"
-               scope="session"
@@ -650 +651 @@
-      <forward name="reffed" path="/subs/showSubs.rdo" redirect="true"/>
-      <forward name="noAccess" path="/subs/showSubs.rdo" redirect="true"/>
+      <forward name="added" path="/subs/showSubs.rdo" redirect="true" />
+      <forward name="updated" path="/subs/showSubs.rdo" redirect="true" />
-      <forward name="success" path="/subs/showSubs.rdo" redirect="true" />
-    </action>

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

@@ -80 +80 @@
-import org.bedework.calsvci.CalSvcIPars;
-
+import edu.rpi.sss.util.Util;
-import edu.rpi.sss.util.jsp.UtilAbstractAction;
-import edu.rpi.sss.util.jsp.UtilActionForm;
@@ -354 +355 @@
-  }
-
+  protected boolean validateSub(BwSubscription sub,
+                                BwActionFormBase form) {
+    sub.setName(Util.checkNull(sub.getName()));
+
+    if (sub.getName() == null) {
+      form.getErr().emit("org.bedework.validation.error.missingfield", "name");
+      return false;
+    }
+
+    sub.setUri(Util.checkNull(sub.getUri()));
+
+    if (!sub.getInternalSubscription() && (sub.getUri() == null)) {
+      form.getErr().emit("org.bedework.validation.error.missingfield", "uri");
+      return false;
+    }
+
+    return true;
+  }
+
+  /** Called to finish off adding or updating a subscription
+   *
+   * @param request
+   * @param sub
+   * @param form
+   * @return String "added" for added, "updated" for updated.
+   * @throws Throwable
+   */
+  protected String finishSubscribe(HttpServletRequest request,
+                                   BwSubscription sub,
+                                   BwActionFormBase form) throws Throwable {
+    CalSvcI svc = form.fetchSvci();
+    String forward;
+
+    String viewName = getReqPar(request, "view");
+    boolean addToDefaultView = false;
+
+    if (viewName == null) {
+      addToDefaultView = true;
+      String str = getReqPar(request, "addtodefaultview");
+      if (str != null) {
+        addToDefaultView = str.equals("y");
+      }
+    }
+
+    Boolean bool = getBooleanReqPar(request, "unremoveable");
+    if (bool != null) {
+      if (!form.getUserAuth().isSuperUser()) {
+        return "noAccess"; // Only super user for that flag
+      }
+
+      sub.setUnremoveable(bool.booleanValue());
+    }
+
+    if (!validateSub(sub, form)) {
+      return "retry";
+    }
+
+    if (getReqPar(request, "addSubscription") != null) {
+      try {
+        svc.addSubscription(sub);
+        forward = "added";
+      } catch (CalFacadeException cfe) {
+        if (CalFacadeException.duplicateSubscription.equals(cfe.getMessage())) {
+          form.getErr().emit(cfe.getMessage());
+          return "success"; // User will see message and we'll stay on page
+        }
+
+        throw cfe;
+      }
+    } else if (getReqPar(request, "updateSubscription") != null) {
+      svc.updateSubscription(sub);
+      forward = "updated";
+    } else {
+      forward = "noaction";
+    }
+
+    if ((viewName == null) && !addToDefaultView) {
+      // We're done - not adding to a view
+      return forward;
+    }
+
+    if (sub != null) {
+      svc.addViewSubscription(viewName, sub);
+    }
+
+    form.setSubscriptions(svc.getSubscriptions());
+
+    return forward;
+  }
+
-  /** Find a user object given a "user" request parameter.
-   *
@@ -359 +450 @@
-   * @param form
-   * @return BwUser     null if not found. Messages emitted
+   * @throws Throwable
+   */
+  /**
+   * @param request
+   * @param form
+   * @return
-   * @throws Throwable
-   */

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

@@ -63 +63 @@
-import org.bedework.webcommon.BwSession;
-
-import edu.rpi.sss.util.Util;
-
-import java.util.Iterator;
-
@@ -70 +68 @@
-import javax.servlet.http.HttpServletResponse;
-
-Subscribe a user
+Complete or update a subscription
- *
- * <p>Parameters are:<ul>
@@ -90 +88 @@
- * @author Mike Douglass   douglm@rpi.edu
- */
-
+End
-  /* (non-Javadoc)
-   * @see org.bedework.webcommon.BwAbstractAction#doAction(javax.servlet.http.HttpServletRequest, org.bedework.webcommon.BwSession, org.bedework.webcommon.BwActionFormBase)
@@ -106 +104 @@
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  }
-

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

@@ -64 +64 @@
-import javax.servlet.http.HttpServletResponse;
-
-
+
+
+
+
+
+
- *
- * <p>Parameters are:<ul>
+ *      <li>"name"              Optional name of subscription</li>
+ *      <li>"display"           Optional setting for display flag</li>
+ *      <li>"affctsFreeBusy"    Optional setting for freebusy</li>
- *      <li>"calPath"           Path to local calendar</li>
- *      <li>"calUri"            URI of remote calendar</li>
@@ -100 +108 @@
-    BwSubscription sub;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    if (calPath == null) {
-request.getParameter(
+getReqPar(request, 
-      if (calUri == null) {
-        return "error";
-      }
-
-
+
+
-
-      /* Try to access the calendar */
@@ -124 +146 @@
-      }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-    form.assignAddingSubscription(true);
-    form.setSubscription(sub);
-
-    return "success";