Changeset 245

Timestamp:

03/01/06 21:10:43

Author:

douglm

Message:

Fix admin group add/update problem. Also prevent duplicate groups

Files:

• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/AdminGroupsDbImpl.java (modified) (1 diff)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/CalFacadeException.java (modified) (3 diffs)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/admingroup/PEFetchAGAction.java (modified) (1 diff)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/admingroup/PEUpdateAGAction.java (modified) (2 diffs)

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

@@ -173 +173 @@
-
-  public void addGroup(BwGroup group) throws CalFacadeException {
+    if (findGroup(group.getAccount()) != null) {
+      throw new CalFacadeException(CalFacadeException.duplicateAdminGroup);
+    }
-    getSess().save(group);
-  }

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

@@ -59 +59 @@
- */
-public class CalFacadeException extends Exception {
-*
+
-   * retrieve a localized message and can also be used to identify the
-   * cause of the exception.
-   */
+  
+  /* ****************** Admin groups ****************************** */
+  
+  /** The admin group already exists */
+  public static final String duplicateAdminGroup =
+      "org.bedework.exception.duplicateadmingroup";
-
+  /* ****************** Calendars ****************************** */
+  
-  /** Couldn't find calendar */
-  public static final String calendarNotFound =
@@ -84 +92 @@
-      "org.bedework.exception.cannotdeletecalendarroot";
-
+  /* ****************** Subscriptions ****************************** */
+  
-  /** Somebody tried to create a duplicate subscription */
-  public static final String duplicateSubscription =
@@ -92 +102 @@
-      "org.bedework.exception.ical.endandduration";
-
-
-
-
-
+
+
-  /** The guid for this event already exists */
-  public static final String duplicateGuid =
-      "org.bedework.exception.duplicateguid";
-
+  /* ****************** Timezones ****************************** */
+  
-  /** Error reading timezones */
-  public static final String timezonesReadError =
-      "org.bedework.error.timezones.readerror";
-
+  /* ****************** Misc ****************************** */
-
+  /** */
+  public static final String illegalObjectClass =
+      "org.bedework.exception.illegalobjectclass";
+  
-  private String extra;
-

trunk/calendar3/webadmin/src/org/bedework/webadmin/admingroup/PEFetchAGAction.java

@@ -114 +114 @@
-    adgrps.getMembers(ag);
-    form.setUpdAdminGroup(ag);
+    form.assignAddingAdmingroup(false);
-
-    return "continue";

trunk/calendar3/webadmin/src/org/bedework/webadmin/admingroup/PEUpdateAGAction.java

@@ -56 +56 @@
-
-import org.bedework.calfacade.BwUser;
+import org.bedework.calfacade.CalFacadeException;
-import org.bedework.calfacade.ifs.Groups;
-import org.bedework.calfacade.svc.BwAdminGroup;
@@ -162 +163 @@
-      }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    } else {
-      if (!validateAdminGroup(form)) {