[Bedework-commit] webapps r370 - in trunk: webadmin/war/docs webclient/war/docs webcommon/src/org/bedework/webcommon

[svnadmin at bedework.org]

Author: douglm
Date: 2007-05-15 10:57:55 -0400 (Tue, 15 May 2007)
New Revision: 370

Modified:
   trunk/webadmin/war/docs/header.jsp
   trunk/webclient/war/docs/header.jsp
   trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java
   trunk/webcommon/src/org/bedework/webcommon/BwActionFormBase.java
Log:
Fix some errors in the user clients caused by removal of principal info from system parameters.

Remove principal info from admin form.

More CalDAV property related fixes.

Modified: trunk/webadmin/war/docs/header.jsp
===================================================================
--- trunk/webadmin/war/docs/header.jsp	2007-05-14 19:47:48 UTC (rev 369)
+++ trunk/webadmin/war/docs/header.jsp	2007-05-15 14:57:55 UTC (rev 370)
@@ -234,11 +234,17 @@
     </logic:present>
   </userInfo>
 
-  <%-- System parameters --%>
+  <%-- System parameters and directory info--%>
   <syspars>
-    <bean:define id="syspars" name="peForm" property="syspars" />
-    <bw:emitText name="syspars" property="userPrincipalRoot" />
-    <bw:emitText name="syspars" property="groupPrincipalRoot" />
+    <logic:present name="peForm" property="dirInfo" >
+      <bean:define id="dir" name="peForm" property="dirInfo" />
+      <bw:emitText name="dir" property="userPrincipalRoot" />
+      <bw:emitText name="dir" property="groupPrincipalRoot" />
+      <bw:emitText name="dir" property="ticketPrincipalRoot" />
+      <bw:emitText name="dir" property="resourcePrincipalRoot" />
+      <bw:emitText name="dir" property="hostPrincipalRoot" />
+      <bw:emitText name="dir" property="venuePrincipalRoot" />
+    </logic:present>
   </syspars>
 
   <logic:iterate id="appvar" name="peForm" property="appVars">

Modified: trunk/webclient/war/docs/header.jsp
===================================================================
--- trunk/webclient/war/docs/header.jsp	2007-05-14 19:47:48 UTC (rev 369)
+++ trunk/webclient/war/docs/header.jsp	2007-05-15 14:57:55 UTC (rev 370)
@@ -354,9 +354,15 @@
 
   <%-- System parameters --%>
   <syspars>
-    <bean:define id="syspars" name="calForm" property="syspars" />
-    <bw:emitText name="syspars" property="userPrincipalRoot" />
-    <bw:emitText name="syspars" property="groupPrincipalRoot" />
+    <logic:present name="calForm" property="dirInfo" >
+      <bean:define id="dir" name="calForm" property="dirInfo" />
+      <bw:emitText name="dir" property="userPrincipalRoot" />
+      <bw:emitText name="dir" property="groupPrincipalRoot" />
+      <bw:emitText name="dir" property="ticketPrincipalRoot" />
+      <bw:emitText name="dir" property="resourcePrincipalRoot" />
+      <bw:emitText name="dir" property="hostPrincipalRoot" />
+      <bw:emitText name="dir" property="venuePrincipalRoot" />
+    </logic:present>
   </syspars>
 
 <%-- ****************************************************************

Modified: trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java	2007-05-14 19:47:48 UTC (rev 369)
+++ trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java	2007-05-15 14:57:55 UTC (rev 370)
@@ -238,6 +238,10 @@
 
     CalSvcI svci = form.fetchSvci();
 
+    if (form.getDirInfo() == null) {
+      form.setDirInfo(svci.getDirectories().getDirectoryInfo());
+    }
+
     if (form.getNewSession()) {
       // Set the default skin
       BwPreferences prefs = svci.getUserPrefs();

Modified: trunk/webcommon/src/org/bedework/webcommon/BwActionFormBase.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/BwActionFormBase.java	2007-05-14 19:47:48 UTC (rev 369)
+++ trunk/webcommon/src/org/bedework/webcommon/BwActionFormBase.java	2007-05-15 14:57:55 UTC (rev 370)
@@ -76,6 +76,7 @@
 import org.bedework.calfacade.BwString;
 import org.bedework.calfacade.BwSystem;
 import org.bedework.calfacade.BwUser;
+import org.bedework.calfacade.DirectoryInfo;
 import org.bedework.calfacade.BwStats.StatsEntry;
 import org.bedework.calfacade.base.UpdateFromTimeZonesInfo;
 import org.bedework.calfacade.configs.ConfigBase;
@@ -132,6 +133,9 @@
   /* This should be a cloned copy only */
   private BwSystem syspars;
 
+  /* This should be a cloned copy only */
+  private DirectoryInfo dirInfo;
+
   private Collection<StatsEntry> sysStats;
 
   private transient MailerIntf mailer;
@@ -595,6 +599,20 @@
     }
   }
 
+  /**
+   * @param val
+   */
+  public void setDirInfo(DirectoryInfo val) {
+    dirInfo = val;
+  }
+
+  /**
+   * @return DirectoryInfo
+   */
+  public DirectoryInfo getDirInfo() {
+    return dirInfo;
+  }
+
   /* ====================================================================
    *                   Timezones
    * ==================================================================== */