Changeset 163

Timestamp:

02/15/06 23:25:56

Author:

douglm

Message:

Check to see if the subscription we are about to delete is referenced by a view.
If so emit error org.bedework.client.error.subscription.reffed with the view name as a parameter (for each view) and return "reffed".

Delete still does not work as the Modify Subscription page needs a hidden field "name" with the name of the subscription as a parameter.

Files:

• trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (modified) (1 diff)
• trunk/calendar3/webadmin/war/WEB-INF/struts-config.xml (modified) (1 diff)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java (modified) (2 diffs)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/subs/SubscribeAction.java (modified) (3 diffs)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/subs/UnsubscribeAction.java (modified) (3 diffs)

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

@@ -920 +920 @@
-
-    prefs.getSubscriptions().remove(val);
-
+//
-  }
-

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

@@ -331 +331 @@
-      <forward name="cancelled" path="/subs/showSubs.rdo" redirect="true"/>
-      <forward name="retry" path="/subs/showSubs.rdo" redirect="true"/>
+      <forward name="reffed" 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

@@ -72 +72 @@
-import org.bedework.calfacade.svc.BwAuthUserPrefs;
-import org.bedework.calfacade.svc.BwSubscription;
+import org.bedework.calfacade.svc.BwView;
-import org.bedework.calfacade.svc.EventInfo;
-import org.bedework.calfacade.svc.UserAuth;
@@ -291 +292 @@
-    form.refreshIsNeeded();
-    return true;
+  }
+  
+  protected String unsubscribe(HttpServletRequest request,
+                                 BwActionFormBase form) throws Throwable {
+    if (form.getGuest()) {
+      return "noAccess"; // First line of defence
+    }
+
+    CalSvcI svc = form.fetchSvci();
+
+    String name = request.getParameter("name");
+
+    if (name == null) {
+      // Assume no access
+      form.getErr().emit("org.bedework.client.error.missingfield", "name");
+      return "error";
+    }
+
+    BwSubscription sub = svc.findSubscription(name);
+
+    if (sub == null) {
+      form.getErr().emit("org.bedework.client.error.nosuchsubscription", name);
+      return "notFound";
+    }
+    
+    if (sub.getUnremoveable() && !form.getUserAuth().isSuperUser()) {
+      return "noAccess"; // Only super user can remove the unremovable
+    }
+    
+        Iterator it = svc.getViews().iterator();
+        boolean reffed = false;
+        while (it.hasNext()) {
+                BwView v = (BwView)it.next();
+                if (v.getSubscriptions().contains(sub)) {
+                        form.getErr().emit("org.bedework.client.error.subscription.reffed", 
+                                                       v.getName());
+                        reffed = true;
+                }
+        }
+        
+        if (reffed) {
+                return "reffed";
+        }
+
+    svc.removeSubscription(sub);
+    form.getMsg().emit("org.bedework.client.message.subscription.removed");
+    return "success";
-  }
-

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

@@ -79 +79 @@
- * <p>Forwards to:<ul>
- *      <li>"error"        some form of fatal error.</li>
+ *      <li>"reffed"       subscription is referenced.</li>
- *      <li>"noAccess"     user not authorised.</li>
- *      <li>"cancelled"    for a cancelled request.</li>
@@ -96 +97 @@
-    if (form.getGuest()) {
-      return "noAccess"; // First line of defence
+    }
+    
+    if (getReqPar(request, "delete") != null) {
+        return unsubscribe(request, form);
-    }
-
@@ -139 +144 @@
-    } else if (getReqPar(request, "updateSubscription") != null) {
-      svc.updateSubscription(sub);
-    } else if (getReqPar(request, "delete") != null) {
-      svc.removeSubscription(sub);
-    } else {
-    }

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

@@ -54 +54 @@
-package org.bedework.webcommon.subs;
-
-import org.bedework.calfacade.svc.BwSubscription;
-import org.bedework.calsvci.CalSvcI;
-import org.bedework.webcommon.BwAbstractAction;
-import org.bedework.webcommon.BwActionFormBase;
@@ -71 +69 @@
- * <p>Forwards to:<ul>
- *      <li>"error"        some form of fatal error.</li>
+ *      <li>"reffed"       subscription is referenced.</li>
- *      <li>"noAccess"     user not authorised.</li>
- *      <li>"notFound"     no such subscription.</li>
@@ -86 +85 @@
-                         BwSession sess,
-                         BwActionFormBase form) throws Throwable {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  }
-}