Changeset 46

Timestamp:

01/27/06 11:31:56

Author:

douglm

Message:

Fixed preferences selection bug for new users logging into admin client.

Files:

• trunk/calendar3/calCore/resources/hbms/Preferences.hbm.xml (modified) (2 diffs)
• trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (modified) (1 diff)
• trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcIPars.java (modified) (1 diff)

trunk/calendar3/calCore/resources/hbms/Preferences.hbm.xml

@@ -21 +21 @@
-                class="org.bedework.calfacade.BwUser"
-                column="ownerid" not-null="true" unique="true"
-view
+pref
-
-    <set name="subscriptions" table="user_subscriptions" lazy="true"
@@ -40 +40 @@
-
-    <many-to-one name="defaultCalendar"
-
-
+
-      <column name="default_calendarid" />
-    </many-to-one>

trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java

@@ -1815 +1815 @@
-
-      BwUser auth;
-
+
+
-        auth = getPublicUser();
-      } else {
-        auth = cali.getUser(pars.getAuthUser());
+      }
+
+      if (debug) {
+        trace("Got auth user object " + auth);
-      }
-      dbi = new CalSvcDb(this, auth);

trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcIPars.java

@@ -205 +205 @@
-  }
-
+  public String toString() {
+    StringBuffer sb = new StringBuffer("CalSvcIPars{");
+
+    sb.append("authUser=");
+    sb.append(getAuthUser());
+    sb.append(", rights=");
+    sb.append(getRights());
+    sb.append(", user=");
+    sb.append(getUser());
+    sb.append(", publicAdmin=");
+    sb.append(getPublicAdmin());
+    sb.append(", caldav=");
+    sb.append(getCaldav());
+    sb.append(", synchid=");
+    sb.append(getSynchId());
+    sb.append(", debug=");
+    sb.append(getDebug());
+    sb.append("}");
+
+    return sb.toString();
+  }
+
-  public Object clone() {
-    CalSvcIPars pars = new CalSvcIPars(getAuthUser(),