[Bedework-commit] webapps r508 - in trunk: webclient/war/docs/event webcommon/src/org/bedework/webcommon/event

[svnadmin at bedework.org]

Author: douglm
Date: 2007-09-07 01:11:58 -0400 (Fri, 07 Sep 2007)
New Revision: 508

Modified:
   trunk/webclient/war/docs/event/eventForm.jsp
   trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java
Log:
Update transparency

Bring admin javascript up to date

Modified: trunk/webclient/war/docs/event/eventForm.jsp
===================================================================
--- trunk/webclient/war/docs/event/eventForm.jsp	2007-09-06 03:00:01 UTC (rev 507)
+++ trunk/webclient/war/docs/event/eventForm.jsp	2007-09-07 05:11:58 UTC (rev 508)
@@ -17,10 +17,10 @@
   <recurrenceId><bean:write name="event" property="recurrenceId"/></recurrenceId>
 
   <genurl:form action="event/editEvent">
-      <bw:emitText name="event" property="scheduleMethod"
-                   tagName="scheduleMethod" />
-      <bw:emitText name="event" property="entityType"
-                   tagName="entityType"/>
+    <bw:emitText name="event" property="scheduleMethod"
+                 tagName="scheduleMethod" />
+    <bw:emitText name="event" property="entityType"
+                 tagName="entityType"/>
 
     <title>
       <html:text name="calForm" property="summary"/>

Modified: trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java	2007-09-06 03:00:01 UTC (rev 507)
+++ trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java	2007-09-07 05:11:58 UTC (rev 508)
@@ -26,6 +26,7 @@
 package org.bedework.webcommon.event;
 
 import org.bedework.appcommon.AccessXmlUtil;
+import org.bedework.appcommon.CheckData;
 import org.bedework.appcommon.ClientError;
 import org.bedework.appcommon.ClientMessage;
 import org.bedework.appcommon.ValidationError;
@@ -286,6 +287,20 @@
 
     BwCalendar destCal = ev.getCalendar();
 
+    /* ------------------------- Transparency ---------------------------- */
+
+    String transp = request.getReqPar("transparency");
+    if (transp != null) {
+      if (CalFacadeUtil.compareStrings(transp, ev.getTransparency()) != 0) {
+        if (CheckData.checkTransparency(transp)) {
+          ev.setTransparency(transp);
+        } else {
+          form.getErr().emit(ValidationError.invalidTransparency);
+          return forwardValidationError;
+        }
+      }
+    }
+
     /* ------------------------- Scheduling ---------------------------- */
     if (adding) {
       ev.setAttendees(form.getAttendees().getAttendees());