[Bedework-commit] webapps r735 - trunk/webcommon/src/org/bedework/webcommon/event

[svnadmin at bedework.org]

Author: douglm
Date: 2008-04-22 09:50:02 -0400 (Tue, 22 Apr 2008)
New Revision: 735

Modified:
   trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java
Log:
Dump all multi-valued properties on trace

Rearrange the update slightly for publish

Modified: trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java	2008-04-22 13:46:03 UTC (rev 734)
+++ trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java	2008-04-22 13:50:02 UTC (rev 735)
@@ -299,16 +299,6 @@
       return res;
     }
 
-    /* ------------------- web submit comment ---------------------------- */
-
-    if (submitApp) {
-      String x = request.getReqPar("xbwsubmitcomment");
-      if (x != null) {
-        ev.addXproperty(new BwXproperty(BwXproperty.bedeworkSubmitComment,
-                                        null, x));
-      }
-    }
-
     /* -------------------------- Dates ------------------------------ */
 
     res = form.getEventDates().updateEvent(ev);
@@ -397,11 +387,10 @@
 
     ev.setPublick(publicAdmin);
 
-    /* ------------------ web submit - change owner -------------------------- */
+    /* ------------------ web submit - copy entities ------------------------ */
 
     if (publishEvent) {
-      /* Change owner and copy entities */
-      changeOwner(ev, svci);
+      copyEntities(ev, svci);
     }
 
     /* ------------------ final validation -------------------------- */
@@ -410,6 +399,13 @@
       return forwardValidationError;
     }
 
+    /* ------------------ web submit - change owner -------------------------- */
+
+    if (publishEvent) {
+      /* Change owner and copy entities */
+      changeOwner(ev, svci);
+    }
+
     try {
       if (adding) {
         svci.getEventsHandler().add(destCal, ei, true);
@@ -491,11 +487,14 @@
 
   private void changeOwner(BwEvent ev,
                            CalSvcI svci) throws CalFacadeException {
-    BwUser origOwner = ev.getOwner();
-
     svci.getEventsHandler().claim(ev);
     ev.setCreator(svci.getUser());
+  }
 
+  private void copyEntities(BwEvent ev,
+                            CalSvcI svci) throws CalFacadeException {
+    BwUser origOwner = ev.getOwner();
+
     /* Copy event entities */
     BwLocation loc = ev.getLocation();
     if ((loc != null) && !loc.getPublick()) {