[Bedework-commit] bwwebapps r80 - in releases/bedework-3.8: feeder/war/docs/event websubmit/war/docs/event

[svnadmin at bedework.org]

Author: douglm
Date: 2012-04-04 21:02:46 -0400 (Wed, 04 Apr 2012)
New Revision: 80

Modified:
   releases/bedework-3.8/feeder/war/docs/event/emitEventCommon.jsp
   releases/bedework-3.8/websubmit/war/docs/event/emitEventDetail.jsp
Log:
Were not skipping ical x-properties on feeder and websubmit

Modified: releases/bedework-3.8/feeder/war/docs/event/emitEventCommon.jsp
===================================================================
--- releases/bedework-3.8/feeder/war/docs/event/emitEventCommon.jsp	2012-03-27 21:01:44 UTC (rev 79)
+++ releases/bedework-3.8/feeder/war/docs/event/emitEventCommon.jsp	2012-04-05 01:02:46 UTC (rev 80)
@@ -53,24 +53,26 @@
     <logic:present name="event" property="xproperties">
       <xproperties>
         <logic:iterate id="xprop" name="event" property="xproperties">
-          <bean:define id="xpropName" name="xprop" property="name"/>
-          <% String xpropStart = "<" + (String)xpropName + ">";
-             String xpropEnd = "</" + (String)xpropName + ">";%>
-          <%=xpropStart%>
-            <logic:present name="xprop" property="parameters">
-              <parameters>
-              <logic:iterate id="xpar" name="xprop" property="parameters">
-                <bean:define id="xparName" name="xpar" property="name"/>
-                <% String xparStart = "<" + (String)xparName + ">";
-                   String xparEnd = "</" + (String)xparName + ">";%>
-                <%=xparStart%><![CDATA[<bean:write name="xpar" property="value" />]]><%=xparEnd%>
-              </logic:iterate>
-              </parameters>
-            </logic:present>
-            <values>
-              <text><![CDATA[<bean:write name="xprop" property="value"/>]]></text>
-            </values>
-          <%=xpropEnd%>
+          <logic:equal name="xprop" property="skipJsp" value="false">
+            <bean:define id="xpropName" name="xprop" property="name"/>
+            <% String xpropStart = "<" + (String)xpropName + ">";
+               String xpropEnd = "</" + (String)xpropName + ">";%>
+            <%=xpropStart%>
+              <logic:present name="xprop" property="parameters">
+                <parameters>
+                <logic:iterate id="xpar" name="xprop" property="parameters">
+                  <bean:define id="xparName" name="xpar" property="name"/>
+                  <% String xparStart = "<" + (String)xparName + ">";
+                     String xparEnd = "</" + (String)xparName + ">";%>
+                  <%=xparStart%><![CDATA[<bean:write name="xpar" property="value" />]]><%=xparEnd%>
+                </logic:iterate>
+                </parameters>
+              </logic:present>
+              <values>
+                <text><![CDATA[<bean:write name="xprop" property="value"/>]]></text>
+              </values>
+            <%=xpropEnd%>
+          </logic:equal>
         </logic:iterate>
       </xproperties>
     </logic:present>

Modified: releases/bedework-3.8/websubmit/war/docs/event/emitEventDetail.jsp
===================================================================
--- releases/bedework-3.8/websubmit/war/docs/event/emitEventDetail.jsp	2012-03-27 21:01:44 UTC (rev 79)
+++ releases/bedework-3.8/websubmit/war/docs/event/emitEventDetail.jsp	2012-04-05 01:02:46 UTC (rev 80)
@@ -79,24 +79,26 @@
     <logic:present name="event" property="xproperties">
       <xproperties>
         <logic:iterate id="xprop" name="event" property="xproperties">
-          <bean:define id="xpropName" name="xprop" property="name"/>
-          <% String xpropStart = "<" + (String)xpropName + ">";
-             String xpropEnd = "</" + (String)xpropName + ">";%>
-          <%=xpropStart%>
-            <logic:present name="xprop" property="parameters">
-              <parameters>
-              <logic:iterate id="xpar" name="xprop" property="parameters">
-                <bean:define id="xparName" name="xpar" property="name"/>
-                <% String xparStart = "<" + (String)xparName + ">";
-                   String xparEnd = "</" + (String)xparName + ">";%>
-                <%=xparStart%><![CDATA[<bean:write name="xpar" property="value" />]]><%=xparEnd%>
-              </logic:iterate>
-              </parameters>
-            </logic:present>
-            <values>
-              <text><![CDATA[<bean:write name="xprop" property="value"/>]]></text>
-            </values>
-          <%=xpropEnd%>
+          <logic:equal name="xprop" property="skipJsp" value="false">
+            <bean:define id="xpropName" name="xprop" property="name"/>
+            <% String xpropStart = "<" + (String)xpropName + ">";
+               String xpropEnd = "</" + (String)xpropName + ">";%>
+            <%=xpropStart%>
+              <logic:present name="xprop" property="parameters">
+                <parameters>
+                <logic:iterate id="xpar" name="xprop" property="parameters">
+                  <bean:define id="xparName" name="xpar" property="name"/>
+                  <% String xparStart = "<" + (String)xparName + ">";
+                     String xparEnd = "</" + (String)xparName + ">";%>
+                  <%=xparStart%><![CDATA[<bean:write name="xpar" property="value" />]]><%=xparEnd%>
+                </logic:iterate>
+                </parameters>
+              </logic:present>
+              <values>
+                <text><![CDATA[<bean:write name="xprop" property="value"/>]]></text>
+              </values>
+            <%=xpropEnd%>
+          </logic:equal>
         </logic:iterate>
       </xproperties>
     </logic:present>