[Bedework-commit] webapps r897 - in trunk/webcommon/src/org/bedework/webcommon: calendars event

[svnadmin at bedework.org]

Author: douglm
Date: 2009-02-26 11:54:47 -0500 (Thu, 26 Feb 2009)
New Revision: 897

Modified:
   trunk/webcommon/src/org/bedework/webcommon/calendars/UpdateCalendarAction.java
   trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java
Log:
Use acls to update access for collections.

Modified: trunk/webcommon/src/org/bedework/webcommon/calendars/UpdateCalendarAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/calendars/UpdateCalendarAction.java	2009-02-24 16:50:02 UTC (rev 896)
+++ trunk/webcommon/src/org/bedework/webcommon/calendars/UpdateCalendarAction.java	2009-02-26 16:54:47 UTC (rev 897)
@@ -54,6 +54,7 @@
 
 package org.bedework.webcommon.calendars;
 
+import org.bedework.appcommon.AccessXmlUtil;
 import org.bedework.appcommon.ClientError;
 import org.bedework.appcommon.ClientMessage;
 import org.bedework.calfacade.BwCalendar;
@@ -66,6 +67,7 @@
 import org.bedework.webcommon.BwActionFormBase;
 import org.bedework.webcommon.BwRequest;
 
+import edu.rpi.cmt.access.Acl;
 import edu.rpi.sss.util.Util;
 
 /** This action updates a calendar.
@@ -207,6 +209,15 @@
       svci.getCalendarsHandler().update(cal);
     }
 
+    /* -------------------------- Access ------------------------------ */
+
+    String aclStr = request.getReqPar("acl");
+    if (aclStr != null) {
+      Acl acl = new AccessXmlUtil(null, svci, debug).getAcl(aclStr);
+
+      svci.changeAccess(cal, acl.getAces(), true);
+    }
+
     form.setParentCalendarPath(null);
 
     if (cal.getCalendarCollection()) {

Modified: trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java	2009-02-24 16:50:02 UTC (rev 896)
+++ trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java	2009-02-26 16:54:47 UTC (rev 897)
@@ -419,6 +419,8 @@
         emitScheduleStatus(form, ur.schedulingResult, false);
       }
 
+      form.assignAddingEvent(false);
+
       /* -------------------------- Access ------------------------------ */
 
       String aclStr = request.getReqPar("acl");
@@ -428,8 +430,7 @@
         svci.changeAccess(ev, acl.getAces(), true);
       }
 
-      form.assignAddingEvent(false);
-
+      /* ========== The old way
       AccessSetter.Pars pars = AccessSetter.parseRequest(request);
 
       if (pars.status == forwardSuccess) {
@@ -441,6 +442,7 @@
       } else if (pars.status != forwardNoAction) {
         return pars.status;
       }
+       ========== */
 
     } catch (CalFacadeException cfe) {
       if (CalFacadeException.noRecurrenceInstances.equals(cfe.getMessage())) {