Changeset 2150

Timestamp:

05/01/09 11:33:18

Author:

johnsa

Message:

admin client: set category filter expressions on calendar collections

Files:

• trunk/deployment/webadmin/webapp/resources/default/default/default.xsl (modified) (3 diffs)
• trunk/deployment/webadmin/webapp/resources/resources/bedework.js (modified) (1 diff)
• trunk/deployment/webadmin/webapp/resources/resources/bwCatFilters.js (deleted)

trunk/deployment/webadmin/webapp/resources/default/default/default.xsl

@@ -309 +309 @@
-            </script>
-          </xsl:if>
-        </xsl:if>
-        <xsl:if test="/bedework/page='modCalendar' or
-                      /bedework/page='modSubscription'">
-          initCatFilters('<xsl:value-of select="/bedework/currentCalendar/filterExpr"/>');
-        </xsl:if>
-        <xsl:if test="/bedework/page='upload' or /bedework/page='selectCalForEvent'">
@@ -3790 +3786 @@
-    <xsl:variable name="calPathEncoded" select="encodedPath"/>
-
-
+ onsubmit="setCatFilters(this)"
-      <xsl:attribute name="action">
-        <xsl:choose>
@@ -3894 +3890 @@
-          <td>
-            <input type="hidden" name="fexpr" value=""/>
+            <!-- display current filter expression to get us going -->
+            <xsl:value-of select="filterExpr"/><xsl:if test="filterExpr !=''"><br/></xsl:if>
-            <a href="javascript:toggleVisibility('filterCategories','visible')">
-              show/hide categories for filtering on output
-            </a>
+
-            <div id="filterCategories" class="invisible">
-              <ul class="catlist">

trunk/deployment/webadmin/webapp/resources/resources/bedework.js

@@ -262 +262 @@
-  }
-}
+// set category filters on calendar collections
+function setCatFilters(formObj) {
+  if (typeof formObj.filterCatUid.length != 'undefined') {
+    var filterExpression = "catuid=(";
+    var filterExists = false;
+    for (i = 0; i < formObj.filterCatUid.length; i++) {
+      if (formObj.filterCatUid[i].checked) {
+        filterExists = true;
+        filterExpression += formObj.filterCatUid[i].value + ",";
+        alert(filterExpression);
+        alert(filterExists);
+      }
+    }
+    alert(filterExists);
+    if (filterExists) {
+      // remove the last comma and close off the expression
+      filterExpression = filterExpression.substring(0,filterExpression.length-1) + ")";
+      alert(filterExpression);
+      // set the form value
+      formObj.fexpr.value = filterExpression;
+    }
+  }
+}