|
From: <fg...@us...> - 2013-09-20 13:39:27
|
Revision: 4332
http://openutils.svn.sourceforge.net/openutils/?rev=4332&view=rev
Author: fgiust
Date: 2013-09-20 13:39:11 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
fix jsp samples
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-move-fields.jsp
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-20 12:38:39 UTC (rev 4331)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-20 13:39:11 UTC (rev 4332)
@@ -78,6 +78,11 @@
*/
public static String entryValue(Node node, String name)
{
+ if (node == null)
+ {
+ return null;
+ }
+
ContextMenuModule module = Components.getComponent(ContextMenuModule.class);
PersistenceStrategy strategy = module.getPersistenceStrategy();
Node nodeUnwrapped = NodeUtil.deepUnwrap(node, HTMLEscapingNodeWrapper.class);
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp 2013-09-20 12:38:39 UTC (rev 4331)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp 2013-09-20 13:39:11 UTC (rev 4332)
@@ -9,7 +9,7 @@
<pre>
<![CDATA[
<contextmenu:element name="firstname" menu="simpleForm">First Name:</contextmenu:element>
-<c:set var="help" value="${'$'}{contextmenu:entryValue(content.JCRNode, 'firstname.help')}" />]]>
+<c:set var="help" value="${'$'}{contextmenu:entryValue(cmsfn:asJCRNode(content), 'firstname.help')}" />]]>
</pre>
<br />
<div class="testcontent clearfix">
@@ -21,7 +21,7 @@
</label>
<div class="col-lg-4">
<input name="firstname" id="firstname" type="text" />
- <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'firstname.help')}" />
+ <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'firstname.help')}" />
<c:if test="${not empty help}">
<span class="help">
<![CDATA[${help}<span class="help-pointer"> </span>]]>
@@ -35,7 +35,7 @@
</label>
<div class="col-lg-4">
<input name="lastname" id="lastname" type="text" />
- <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'lastname.help')}" />
+ <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'lastname.help')}" />
<c:if test="${not empty help}">
<span class="help">
<![CDATA[${help}<span class="help-pointer"> </span>]]>
@@ -49,7 +49,7 @@
</label>
<div class="col-lg-4">
<input name="email" id="email" type="text" />
- <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'email.help')}" />
+ <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'email.help')}" />
<c:if test="${not empty help}">
<span class="help">
<![CDATA[${help}<span class="help-pointer"> </span>]]>
@@ -72,7 +72,7 @@
<option value="1942">1942</option>
<option value="1999">1999</option>
</select>
- <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'year.help')}" />
+ <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'year.help')}" />
<c:if test="${not empty help}">
<span class="help">
<![CDATA[${help}<span class="help-pointer"> </span>]]>
@@ -86,7 +86,7 @@
</label>
<div class="col-lg-4">
<input name="username" id="username" type="text" />
- <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'username.help')}" />
+ <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'username.help')}" />
<c:if test="${not empty help}">
<span class="help">
<![CDATA[${help}<span class="help-pointer"> </span>]]>
@@ -100,7 +100,7 @@
</label>
<div class="col-lg-4">
<input name="password" id="password" type="password" />
- <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'password.help')}" />
+ <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'password.help')}" />
<c:if test="${not empty help}">
<span class="help">
<![CDATA[${help}<span class="help-pointer"> </span>]]>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-move-fields.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-move-fields.jsp 2013-09-20 12:38:39 UTC (rev 4331)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-move-fields.jsp 2013-09-20 13:39:11 UTC (rev 4332)
@@ -33,7 +33,7 @@
</label>
<div class="controls">
<input name="field1" id="field1" type="text" />
- <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'field1.help')}" />
+ <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'field1.help')}" />
<c:if test="${not empty help}">
<span class="help">
<![CDATA[${help}<span class="help-pointer"> </span>]]>
@@ -49,7 +49,7 @@
</label>
<div class="controls">
<input name="field2" id="field2" type="text" />
- <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'field2.help')}" />
+ <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'field2.help')}" />
<c:if test="${not empty help}">
<span class="help">
<![CDATA[${help}<span class="help-pointer"> </span>]]>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|