Changeset 42

Timestamp:

01/26/06 16:08:11

Author:

douglm

Message:

Fix events validation

Files:

• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/UserAuthUWDbImpl.java (modified) (1 diff)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/BwPrincipal.java (modified) (3 diffs)
• trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/errors.xsl (modified) (1 diff)
• trunk/calendar3/docs/todo.txt (modified) (4 diffs)
• trunk/calendar3/tools/dumprestore/build.xml (modified) (1 diff)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/PEActionForm.java (modified) (8 diffs)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/event/PEUpdateEventAction.java (modified) (3 diffs)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/BwWebUtil.java (modified) (1 diff)

trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/UserAuthUWDbImpl.java

@@ -69 +69 @@
-import org.apache.log4j.Logger;
-
-UW
+Bedwork
- *
- * @author Mike Douglass    douglm@rpi.edu

trunk/calendar3/calFacade/src/org/bedework/calfacade/BwPrincipal.java

@@ -84 +84 @@
-public abstract class BwPrincipal extends BwDbentity
-                                  implements AccessPrincipal, Comparator {
-  /** The kind of Principal returned by getKind() */
-
-  /** user */
-  public static final int principalUser = 0;
-
-  /** group */
-  public static final int principalGroup = 1;
-
-  /** host */
-  public static final int principalHost = 2;
-
-  /** Used for db version checks
-   */
-  protected int seq;
-
-  /** The internal name by which this principal is identified, unique within
-   * its class
@@ -170 +155 @@
-   */
-  public abstract int getKind();
-
-  /** Set the db version
-   *
-   * @param val   db version number
-   */
-  public void setSeq(int val) {
-    seq = val;
-  }
-
-  /** Get the db version
-   *
-   * @return int    the db version
-   */
-  public int getSeq() {
-    return seq;
-  }
-
-  /** Set the unauthenticated state.
@@ -466 +435 @@
-    BwPrincipal p2 = (BwPrincipal)o2;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-  }
-

trunk/calendar3/deployment/webadmin/webapp/resources/en_US/default/errors.xsl

@@ -71 +71 @@
-        You must supply a title<br/>
-      </xsl:when>
+      <xsl:when test="id='org.bedework.validation.error.nocalendar'">
+        You must supply the calendar<br/>
+      </xsl:when>
-      <xsl:when test="id='org.bedework.validation.error.nodescription'">
-        You must supply a description<br/>

trunk/calendar3/docs/todo.txt

@@ -3 +3 @@
---------------------------------------------------------------------------------
---------------------------------------------------------------------------------
-
+
+
+
---------------------------------------------------------------------------------
-Finish off moving calendar labelling stuff out of TimeDateComponents
@@ -101 +103 @@
-Fix the add event link in calendar gui
---------------------------------------------------------------------------------
-Remove target from BwEvent?
---------------------------------------------------------------------------------
-We probably need the equivalent of an event info object at the Calintf level to
@@ -322 +323 @@
-Delete in user calendar doesn't work
---------------------------------------------------------------------------------
-Caused by: java.io.NotSerializableException: org.apache.log4j.Logger
---------------------------------------------------------------------------------
-Event_Attendees table has wrong column name
@@ -420 +420 @@
-Manage calendars.
-
-Use /calendar/initAdd to specify parent
-http://localhost:8080/caladmin/calendar/initAdd.do?calId=123
-
-Then
-http://localhost:8080/caladmin/calendar/update.do?...
-with calendar fields.
-
-To update go to
-http://localhost:8080/caladmin/calendar/fetchForUpdate.do?calId=123
-then on to update
-
-Deletion should start off as update then on to
-http://localhost:8080/caladmin/calendar/delete.do?...
-
-**********************************
-Check that access is limited to calendars to which auth user has at least
-write-content access

trunk/calendar3/tools/dumprestore/build.xml

@@ -238 +238 @@
-      <arg line="${org.bedework.restore.arg.admingroupsClass}" />
-      <arg line="${org.bedework.restore.arg.usergroupsClass}" />
+      <!--
-      <jvmarg value="-Xrunyjpagent:cpu=times,onexit=cpu" />
+      -->
-      <!--
-      <arg value="-Djava.endorsed.dir=${org.bedework.default.lib}/endorsed"/>-->

trunk/calendar3/webadmin/src/org/bedework/webadmin/PEActionForm.java

@@ -145 +145 @@
-  /** Set if we appear to be changing the event category.
-   */
-
-
-
+
+
-
-  /* ....................................................................
@@ -397 +396 @@
-
-    /* A is the All box, B is the user preferred values. */
-ke
+categor
-
-    BwSponsor s = event.getSponsor();
@@ -526 +525 @@
-  public void setCategoryId(int val) {
-    if (val >= 0) {
-ke
+categor
-    }
-  }
@@ -538 +537 @@
-   */
-  public int getOriginalCategoryId() {
-ke
+categor
-      return 0;
-    }
-
-ke
+categor
-  }
-
@@ -550 +549 @@
-  public void setPrefCategoryId(int val) {
-    if (val >= 0) {
-ke
+categor
-    }
-  }
@@ -1089 +1088 @@
-   * ==================================================================== */
-
-  /** Ensure the event has all required fields and all are valid.
-   *
-   * <p>This method will retrieve any selected contacts, locations and
-   * categories and embed them in the form and event.
-   *
-   * @return boolean   true   event looks OK
-   * @throws Throwable
-   */
-  public boolean validateEvent() throws Throwable {
-    boolean ok = validateEventCategory();
-    BwEvent ev = getEvent();
-
-    if (!validateEventSponsor()) {
-      ok = false;
-    }
-
-    if (!validateEventLocation()) {
-      ok = false;
-    }
-
-    if (!validateEventCalendar()) {
-      ok = false;
-    }
-
-    if (!getEventDates().updateEvent(ev, getCalSvcI().getTimezones())) {
-      ok = false;
-    } else {
-      ok = BwWebUtil.validateEvent(this.getCalSvcI(), ev, true, //  descriptionRequired
-                                   err);
-    }
-
-    return ok;
-  }
-
-  /**
-   *
@@ -1129 +1094 @@
-   */
-  public boolean validateEventCategory() throws Throwable {
-ke
+categor
-
-    if (id <= 0) {
@@ -1148 +1113 @@
-      }
-
-ke
+categor
-        return true;
-      }

trunk/calendar3/webadmin/src/org/bedework/webadmin/event/PEUpdateEventAction.java

@@ -62 +62 @@
-import org.bedework.webadmin.PEActionForm;
-import org.bedework.webcommon.BwSession;
+import org.bedework.webcommon.BwWebUtil;
-
-
@@ -121 +122 @@
-
-    CalSvcI svci = form.getCalSvcI();
-form.validateEvent(
+validateEvent(form
-      return "retry";
-    }
@@ -155 +156 @@
-    return "continue";
-  }
+
+  /* Ensure the event has all required fields and all are valid.
+   *
+   * <p>This method will retrieve any selected contacts, locations and
+   * categories and embed them in the form and event.
+   */
+  private boolean validateEvent(PEActionForm form) throws Throwable {
+    boolean ok = form.validateEventCategory();
+    BwEvent ev = form.getEvent();
+    CalSvcI svci = form.getCalSvcI();
+
+    if (!form.validateEventSponsor()) {
+      ok = false;
+    }
+
+    if (!form.validateEventLocation()) {
+      ok = false;
+    }
+
+    if (!form.validateEventCalendar()) {
+      ok = false;
+    }
+
+    if (!form.getEventDates().updateEvent(ev, svci.getTimezones())) {
+      ok = false;
+    } else {
+      ok = BwWebUtil.validateEvent(svci, ev, true, //  descriptionRequired
+                                   form.getErr());
+    }
+
+    return ok;
+  }
-}
-

trunk/calendar3/webcommon/src/org/bedework/webcommon/BwWebUtil.java

@@ -178 +178 @@
-    ev.setDescription(checkNull(ev.getDescription()));
-
+    if (ev.getCalendar() == null) {
+      err.emit("org.bedework.validation.error.nocalendar");
+      ok = false;
+    }
+
-    if (ev.getSummary() == null) {
-      err.emit("org.bedework.validation.error.notitle");