Author: ivaynberg
Date: Thu Feb 10 19:46:25 2011
New Revision: 1069543

URL: http://svn.apache.org/viewvc?rev=1069543&view=rev
Log:

Issue: WICKET-3438

Modified:
    
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
    
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Default_Result.html
    
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Default_SubmitResult.html
    
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Hybrid_Result.html
    
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Hybrid_SubmitResult.html
    
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Indexed_Result.html
    
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Indexed_SubmitResult.html
    
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_QueryString_Result.html
    
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_QueryString_SubmitResult.html

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java?rev=1069543&r1=1069542&r2=1069543&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/main/java/org/apache/wicket/markup/html/form/Form.java
 Thu Feb 10 19:46:25 2011
@@ -1588,7 +1588,17 @@ public class Form<T> extends WebMarkupCo
         */
        public final String getHiddenFieldId()
        {
-               return getInputNamePrefix() + getMarkupId() + "_hf_0";
+               String formId;
+               if (!getPage().isPageStateless())
+               {
+                       // only assigned inside statefull pages WICKET-3438
+                       formId = getMarkupId();
+               }
+               else
+               {
+                       formId = getId();
+               }
+               return getInputNamePrefix() + formId + "_hf_0";
        }
 
        /**

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Default_Result.html
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Default_Result.html?rev=1069543&r1=1069542&r2=1069543&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Default_Result.html
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Default_Result.html
 Thu Feb 10 19:46:25 2011
@@ -8,7 +8,7 @@
                <br />
                <a wicket:id="indexLink" 
href="?wicket:bookmarkablePage=:org.apache.wicket.markup.html.autolink.Index">go
 to index</a>
                
-               <form wicket:id="statelessform" id="statelessform1" 
method="post" 
action="stateless/wicket:interface/:0:statelessform::IFormSubmitListener::"><div
 
style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input
 type="hidden" name="statelessform1_hf_0" id="statelessform1_hf_0" /></div>
+               <form wicket:id="statelessform" id="statelessform1" 
method="post" 
action="stateless/wicket:interface/:0:statelessform::IFormSubmitListener::"><div
 
style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input
 type="hidden" name="statelessform_hf_0" id="statelessform_hf_0" /></div>
                <input type="text" wicket:id="textfield" value="" 
name="textfield">
                <input type="submit"> 
                </form>

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Default_SubmitResult.html
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Default_SubmitResult.html?rev=1069543&r1=1069542&r2=1069543&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Default_SubmitResult.html
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Default_SubmitResult.html
 Thu Feb 10 19:46:25 2011
@@ -8,7 +8,7 @@
                <br />
                <a wicket:id="indexLink" 
href="../../../?wicket:bookmarkablePage=:org.apache.wicket.markup.html.autolink.Index">go
 to index</a>
                
-               <form wicket:id="statelessform" id="statelessform2" 
method="post" 
action="../../../stateless/wicket:interface/:1:statelessform::IFormSubmitListener::"><div
 
style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input
 type="hidden" name="statelessform2_hf_0" id="statelessform2_hf_0" /></div>
+               <form wicket:id="statelessform" id="statelessform2" 
method="post" 
action="../../../stateless/wicket:interface/:1:statelessform::IFormSubmitListener::"><div
 
style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input
 type="hidden" name="statelessform_hf_0" id="statelessform_hf_0" /></div>
                <input type="text" wicket:id="textfield" value="test" 
name="textfield">
                <input type="submit"> 
                </form>

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Hybrid_Result.html
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Hybrid_Result.html?rev=1069543&r1=1069542&r2=1069543&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Hybrid_Result.html
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Hybrid_Result.html
 Thu Feb 10 19:46:25 2011
@@ -8,7 +8,7 @@
                <br />
                <a wicket:id="indexLink" 
href="?wicket:bookmarkablePage=:org.apache.wicket.markup.html.autolink.Index">go
 to index</a>
                
-               <form wicket:id="statelessform" id="statelessform1" 
method="post" 
action="stateless/wicket:interface/:0:statelessform::IFormSubmitListener::"><div
 
style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input
 type="hidden" name="statelessform1_hf_0" id="statelessform1_hf_0" /></div>
+               <form wicket:id="statelessform" id="statelessform1" 
method="post" 
action="stateless/wicket:interface/:0:statelessform::IFormSubmitListener::"><div
 
style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input
 type="hidden" name="statelessform_hf_0" id="statelessform_hf_0" /></div>
                <input type="text" wicket:id="textfield" value="" 
name="textfield">
                <input type="submit"> 
                </form>

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Hybrid_SubmitResult.html
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Hybrid_SubmitResult.html?rev=1069543&r1=1069542&r2=1069543&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Hybrid_SubmitResult.html
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Hybrid_SubmitResult.html
 Thu Feb 10 19:46:25 2011
@@ -8,7 +8,7 @@
                <br />
                <a wicket:id="indexLink" 
href="../../../?wicket:bookmarkablePage=:org.apache.wicket.markup.html.autolink.Index">go
 to index</a>
                
-               <form wicket:id="statelessform" id="statelessform2" 
method="post" 
action="../../../stateless/wicket:interface/:1:statelessform::IFormSubmitListener::"><div
 
style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input
 type="hidden" name="statelessform2_hf_0" id="statelessform2_hf_0" /></div>
+               <form wicket:id="statelessform" id="statelessform2" 
method="post" 
action="../../../stateless/wicket:interface/:1:statelessform::IFormSubmitListener::"><div
 
style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input
 type="hidden" name="statelessform_hf_0" id="statelessform_hf_0" /></div>
                <input type="text" wicket:id="textfield" value="test" 
name="textfield">
                <input type="submit"> 
                </form>

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Indexed_Result.html
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Indexed_Result.html?rev=1069543&r1=1069542&r2=1069543&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Indexed_Result.html
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Indexed_Result.html
 Thu Feb 10 19:46:25 2011
@@ -8,7 +8,7 @@
                <br />
                <a wicket:id="indexLink" 
href="?wicket:bookmarkablePage=:org.apache.wicket.markup.html.autolink.Index">go
 to index</a>
                
-               <form wicket:id="statelessform" id="statelessform1" 
method="post" 
action="stateless/wicket:interface/:0:statelessform::IFormSubmitListener::"><div
 
style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input
 type="hidden" name="statelessform1_hf_0" id="statelessform1_hf_0" /></div>
+               <form wicket:id="statelessform" id="statelessform1" 
method="post" 
action="stateless/wicket:interface/:0:statelessform::IFormSubmitListener::"><div
 
style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input
 type="hidden" name="statelessform_hf_0" id="statelessform_hf_0" /></div>
                <input type="text" wicket:id="textfield" value="" 
name="textfield">
                <input type="submit"> 
                </form>

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Indexed_SubmitResult.html
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Indexed_SubmitResult.html?rev=1069543&r1=1069542&r2=1069543&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Indexed_SubmitResult.html
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_Indexed_SubmitResult.html
 Thu Feb 10 19:46:25 2011
@@ -8,7 +8,7 @@
                <br />
                <a wicket:id="indexLink" 
href="../../../?wicket:bookmarkablePage=:org.apache.wicket.markup.html.autolink.Index">go
 to index</a>
                
-               <form wicket:id="statelessform" id="statelessform2" 
method="post" 
action="../../../stateless/wicket:interface/:1:statelessform::IFormSubmitListener::"><div
 
style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input
 type="hidden" name="statelessform2_hf_0" id="statelessform2_hf_0" /></div>
+               <form wicket:id="statelessform" id="statelessform2" 
method="post" 
action="../../../stateless/wicket:interface/:1:statelessform::IFormSubmitListener::"><div
 
style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input
 type="hidden" name="statelessform_hf_0" id="statelessform_hf_0" /></div>
                <input type="text" wicket:id="textfield" value="test" 
name="textfield">
                <input type="submit"> 
                </form>

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_QueryString_Result.html
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_QueryString_Result.html?rev=1069543&r1=1069542&r2=1069543&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_QueryString_Result.html
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_QueryString_Result.html
 Thu Feb 10 19:46:25 2011
@@ -8,7 +8,7 @@
                <br />
                <a wicket:id="indexLink" 
href="?wicket:bookmarkablePage=:org.apache.wicket.markup.html.autolink.Index">go
 to index</a>
                
-               <form wicket:id="statelessform" id="statelessform1" 
method="post" 
action="stateless?wicket:interface=:0:statelessform::IFormSubmitListener::"><div
 
style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input
 type="hidden" name="statelessform1_hf_0" id="statelessform1_hf_0" /></div>
+               <form wicket:id="statelessform" id="statelessform1" 
method="post" 
action="stateless?wicket:interface=:0:statelessform::IFormSubmitListener::"><div
 
style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input
 type="hidden" name="statelessform_hf_0" id="statelessform_hf_0" /></div>
                <input type="text" wicket:id="textfield" value="" 
name="textfield">
                <input type="submit"> 
                </form>

Modified: 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_QueryString_SubmitResult.html
URL: 
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_QueryString_SubmitResult.html?rev=1069543&r1=1069542&r2=1069543&view=diff
==============================================================================
--- 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_QueryString_SubmitResult.html
 (original)
+++ 
wicket/branches/wicket-1.4.x/wicket/src/test/java/org/apache/wicket/request/target/coding/StatelessPage_QueryString_SubmitResult.html
 Thu Feb 10 19:46:25 2011
@@ -8,7 +8,7 @@
                <br />
                <a wicket:id="indexLink" 
href="../?wicket:bookmarkablePage=:org.apache.wicket.markup.html.autolink.Index">go
 to index</a>
                
-               <form wicket:id="statelessform" id="statelessform2" 
method="post" 
action="../stateless?wicket:interface=:1:statelessform::IFormSubmitListener::"><div
 
style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input
 type="hidden" name="statelessform2_hf_0" id="statelessform2_hf_0" /></div>
+               <form wicket:id="statelessform" id="statelessform2" 
method="post" 
action="../stateless?wicket:interface=:1:statelessform::IFormSubmitListener::"><div
 
style="width:0px;height:0px;position:absolute;left:-100px;top:-100px;overflow:hidden"><input
 type="hidden" name="statelessform_hf_0" id="statelessform_hf_0" /></div>
                <input type="text" wicket:id="textfield" value="test" 
name="textfield">
                <input type="submit"> 
                </form>


Reply via email to