billbarker 2004/12/01 19:49:01
Modified: webapps/admin tree-control-test.jsp
webapps/admin/WEB-INF/classes/org/apache/webapp/admin
TreeControlTag.java
Log:
Fix problem where EL expression is used as a place holder.
Fix for Bug #32381
Submitted By: Allistair Crossley [EMAIL PROTECTED]
Revision Changes Path
1.3 +1 -2
jakarta-tomcat-catalina/webapps/admin/tree-control-test.jsp
Index: tree-control-test.jsp
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/tree-control-test.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tree-control-test.jsp 24 Jul 2002 20:57:25 -0000 1.2
+++ tree-control-test.jsp 2 Dec 2004 03:49:01 -0000 1.3
@@ -18,9 +18,8 @@
<!-- Tree Component -->
-<td width="200">
<controls:tree tree="treeControlTest"
- action="treeControlTest.do?tree=${name}"
+ action="treeControlTest.do?tree={name}"
style="tree-control"
styleSelected="tree-control-selected"
styleUnselected="tree-control-unselected"
1.5 +5 -5
jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java
Index: TreeControlTag.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-catalina/webapps/admin/WEB-INF/classes/org/apache/webapp/admin/TreeControlTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TreeControlTag.java 18 Oct 2004 06:37:53 -0000 1.4
+++ TreeControlTag.java 2 Dec 2004 03:49:01 -0000 1.5
@@ -33,7 +33,7 @@
* This tag has the following user-settable attributes:</p>
* <ul>
* <li><strong>action</strong> - Hyperlink to which expand/contract actions
- * should be sent, with a string "<code>${node}</code> marking where
+ * should be sent, with a string "<code>{name}</code> marking where
* the node name of the affected node should be included.</li>
* <li><strong>images</strong> - Name of the directory containing the images
* for our icons, relative to the page including this tag. If not
@@ -88,7 +88,7 @@
/**
* The hyperlink to be used for submitting requests to expand and
- * contract tree nodes. The placeholder "<code>${name}</code>" will
+ * contract tree nodes. The placeholder "<code>{name}</code>" will
* be replaced by the <code>name</code> property of the current
* tree node.
*/
@@ -350,11 +350,11 @@
// character in parameter values.
String encodedNodeName =
URLEncoder.encode(node.getName(),TomcatTreeBuilder.URL_ENCODING);
- String action = replace(getAction(), "${name}", encodedNodeName);
+ String action = replace(getAction(), "{name}", encodedNodeName);
String updateTreeAction =
- replace(getAction(), "tree=${name}", "select=" +
encodedNodeName);
+ replace(getAction(), "tree={name}", "select=" + encodedNodeName);
updateTreeAction =
((HttpServletResponse) pageContext.getResponse()).
encodeURL(updateTreeAction);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
