Changeset 532

Timestamp:

06/05/06 10:23:17

Author:

douglm

Message:

Small fix to event validation.
Use syspar length to limit description length

Files:

• trunk/calendar3/calFacade/src/org/bedework/calfacade/BwEvent.java (modified) (1 diff)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/PEActionForm.java (modified) (1 diff)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/event/PEUpdateEventAction.java (modified) (1 diff)
• trunk/calendar3/webclient/src/org/bedework/webclient/BwAddEventAction.java (modified) (1 diff)
• trunk/calendar3/webclient/src/org/bedework/webclient/BwEditEventAction.java (modified) (1 diff)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/BwWebUtil.java (modified) (4 diffs)

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

@@ -159 +159 @@
-  private String summary;
-
-  /** This should be set by the back end code.
-   */
-  public static final int maxDescriptionLength = 500;
-
-  private String description;
-

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

@@ -207 +207 @@
-   */
-  public int getMaxDescriptionLength() {
-
+
+
+
+
+
+
-  }
-

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

@@ -207 +207 @@
-    if (!form.getEventDates().updateEvent(event, svci.getTimezones())) {
-      ok = false;
-ENUM  descriptionRequired
+public
-                                        err)) {
-      ok = false;

trunk/calendar3/webclient/src/org/bedework/webclient/BwAddEventAction.java

@@ -101 +101 @@
-
-    if (!form.getEventDates().updateEvent(ev, svci.getTimezones()) ||
-descriptionRequired
+public
-                                 form.getErr())) {
-      return "doNothing";

trunk/calendar3/webclient/src/org/bedework/webclient/BwEditEventAction.java

@@ -161 +161 @@
-
-    if (!form.getEventDates().updateEvent(ev, svci.getTimezones()) ||
-descriptionRequired
+public
-                                 form.getErr())) {
-      return "doNothing";

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

@@ -59 +59 @@
-import org.bedework.calfacade.BwLocation;
-import org.bedework.calfacade.BwSponsor;
+import org.bedework.calfacade.BwSystem;
-import org.bedework.calfacade.CalFacadeException;
-import org.bedework.calsvci.CalSvcI;
@@ -166 +167 @@
-   * @param svci
-   * @param ev
-descriptionRequired
+publicEvent    requirements will differ
-   * @param err
-   * @return boolean true for ok
-   * @throws CalFacadeException
-   */
-
+
+
-                                      MessageEmit err) throws CalFacadeException {
-    boolean ok = true;
@@ -177 +179 @@
-    ev.setSummary(checkNull(ev.getSummary()));
-    ev.setDescription(checkNull(ev.getDescription()));
+    ev.setLink(checkNull(ev.getLink()));
-
-    if (ev.getCalendar() == null) {
@@ -183 +186 @@
-    }
-
+    BwSystem syspars = svci.getSyspars();
+    int maxDescLen;
+    if (publicEvent) {
+      maxDescLen = syspars.getMaxPublicDescriptionLength();
+    } else {
+      maxDescLen = syspars.getMaxUserDescriptionLength();
+    }
+
-    if (ev.getSummary() == null) {
-      err.emit("org.bedework.validation.error.notitle");
-      ok = false;
+    } else if (ev.getSummary().length() > maxDescLen) {
+      // Use the description length here
+      err.emit("org.bedework.validation.error.toolong.summary",
+               String.valueOf(maxDescLen));
+      ok = false;
-    }
-
-    if (ev.getDescription() == null) {
-descriptionRequired
+publicEvent
-        err.emit("org.bedework.validation.error.nodescription");
-        ok = false;
-      }
-
-
+
+
+
-      ok = false;
-    }