Author: knopp
Date: Mon Apr 7 12:14:55 2008
New Revision: 645650
URL: http://svn.apache.org/viewvc?rev=645650&view=rev
Log:
WICKET-1492
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java?rev=645650&r1=645649&r2=645650&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
Mon Apr 7 12:14:55 2008
@@ -1265,14 +1265,7 @@
// add the submitting component
final Component submittingComponent =
(Component)defaultSubmittingComponent;
buffer.append("<input type=\"submit\" name=\"");
- if (submittingComponent instanceof FormComponent)
- {
-
buffer.append(((FormComponent)submittingComponent).getInputName());
- }
- else
- {
- buffer.append(submittingComponent.getPath());
- }
+ buffer.append(defaultSubmittingComponent.getInputName());
buffer.append("\" onclick=\" var b=Wicket.$('");
buffer.append(submittingComponent.getMarkupId());
buffer.append("'); if (typeof(b.onclick) != 'undefined') { var
r = b.onclick.bind(b)(); if (r != false) b.click(); } else { b.click(); };
return false;\" ");
@@ -1351,7 +1344,7 @@
*/
protected final String getHiddenFieldId()
{
- return getJavascriptId() + "_hf_0";
+ return getInputNamePrefix() + getJavascriptId() + "_hf_0";
}
/**
@@ -1928,5 +1921,14 @@
add(removed);
}
+ }
+
+ /**
+ * Allows to customize input names of form components inside this form.
+ *
+ * @return String that well be used as prefix to form component input
names
+ */
+ protected String getInputNamePrefix() {
+ return "";
}
}
Modified:
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java?rev=645650&r1=645649&r2=645650&view=diff
==============================================================================
---
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
(original)
+++
wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
Mon Apr 7 12:14:55 2008
@@ -716,7 +716,16 @@
{
inputName.prepend(Component.PATH_SEPARATOR);
}
- return inputName.toString();
+ Form form = (Form)findParent(Form.class);
+
+ if (form != null)
+ {
+ return form.getInputNamePrefix() + inputName.toString();
+ }
+ else
+ {
+ return inputName.toString();
+ }
}
/**
