[Bedework-commit] webapps r752 - in releases/bedework-3.4.1.1/webcommon/src/org/bedework/webcommon: . event schedule

[svnadmin at bedework.org]

Author: douglm
Date: 2008-05-12 23:22:57 -0400 (Mon, 12 May 2008)
New Revision: 752

Modified:
   releases/bedework-3.4.1.1/webcommon/src/org/bedework/webcommon/BwAbstractAction.java
   releases/bedework-3.4.1.1/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java
   releases/bedework-3.4.1.1/webcommon/src/org/bedework/webcommon/schedule/AttendeeRespond.java
Log:
Don't update the incoming event summary/description for COUNTER when those request parameters are null.

Modified: releases/bedework-3.4.1.1/webcommon/src/org/bedework/webcommon/BwAbstractAction.java
===================================================================
--- releases/bedework-3.4.1.1/webcommon/src/org/bedework/webcommon/BwAbstractAction.java	2008-05-12 20:23:44 UTC (rev 751)
+++ releases/bedework-3.4.1.1/webcommon/src/org/bedework/webcommon/BwAbstractAction.java	2008-05-13 03:22:57 UTC (rev 752)
@@ -1644,10 +1644,12 @@
    *
    * @param request
    * @param ev
+   * @param skipNull - don't update for null values.
    * @throws Throwable
    */
   protected void setEventText(BwRequest request,
-                              BwEvent ev) throws Throwable {
+                              BwEvent ev,
+                              boolean skipNull) throws Throwable {
     BwActionFormBase form = request.getBwForm();
 
     boolean adding = form.getAddingEvent();
@@ -1655,14 +1657,14 @@
     String summary = request.getReqPar("summary");
     String summaryLang = request.getReqPar("summaryLang");
 
-    if (!adding || (summary != null)) {
+    if ((summary != null) || (!adding && !skipNull)) {
       ev.updateSummaries(summaryLang, summary);
     }
 
     String description = request.getReqPar("description");
     String descriptionLang = request.getReqPar("descriptionLang");
 
-    if (!adding || (description != null)) {
+    if ((description != null) || (!adding && !skipNull)) {
       ev.updateDescriptions(descriptionLang, description);
     }
   }

Modified: releases/bedework-3.4.1.1/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java
===================================================================
--- releases/bedework-3.4.1.1/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java	2008-05-12 20:23:44 UTC (rev 751)
+++ releases/bedework-3.4.1.1/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java	2008-05-13 03:22:57 UTC (rev 752)
@@ -292,7 +292,7 @@
 
     /* ------------------------ Text fields ------------------------------ */
 
-    setEventText(request, ev);
+    setEventText(request, ev, false);
 
     int res = processXprops(request, ev);
     if (res == forwardValidationError) {

Modified: releases/bedework-3.4.1.1/webcommon/src/org/bedework/webcommon/schedule/AttendeeRespond.java
===================================================================
--- releases/bedework-3.4.1.1/webcommon/src/org/bedework/webcommon/schedule/AttendeeRespond.java	2008-05-12 20:23:44 UTC (rev 751)
+++ releases/bedework-3.4.1.1/webcommon/src/org/bedework/webcommon/schedule/AttendeeRespond.java	2008-05-13 03:22:57 UTC (rev 752)
@@ -155,7 +155,7 @@
       boolean publicAdmin = getPublicAdmin(form);
 
       /* ------------------------ Text fields ------------------------------ */
-      setEventText(request, ev);
+      setEventText(request, ev, true);
 
       /* -------------------------- Dates ------------------------------ */
       int res = form.getEventDates().updateEvent(ev);