Author: andyhot
Date: Sun Nov  5 07:54:57 2006
New Revision: 471451

URL: http://svn.apache.org/viewvc?view=rev&rev=471451
Log:
namespace the id of each form element with the id of the current form... 
resovles TAPESTRY-1131

Modified:
    
tapestry/tapestry4/branches/4.1.1-clientIds/tapestry-framework/src/java/org/apache/tapestry/form/Form.java
    
tapestry/tapestry4/branches/4.1.1-clientIds/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java

Modified: 
tapestry/tapestry4/branches/4.1.1-clientIds/tapestry-framework/src/java/org/apache/tapestry/form/Form.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry4/branches/4.1.1-clientIds/tapestry-framework/src/java/org/apache/tapestry/form/Form.java?view=diff&rev=471451&r1=471450&r2=471451
==============================================================================
--- 
tapestry/tapestry4/branches/4.1.1-clientIds/tapestry-framework/src/java/org/apache/tapestry/form/Form.java
 (original)
+++ 
tapestry/tapestry4/branches/4.1.1-clientIds/tapestry-framework/src/java/org/apache/tapestry/form/Form.java
 Sun Nov  5 07:54:57 2006
@@ -193,6 +193,9 @@
         
         if (isRewinding())
         {
+            // even if we're rewinding, make sure we 'train' the idallocator.
+            renderIdAttribute(writer, cycle);
+            
             String submitType = _formSupport.rewind();
 
             IActionListener listener = findListener(submitType);

Modified: 
tapestry/tapestry4/branches/4.1.1-clientIds/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java
URL: 
http://svn.apache.org/viewvc/tapestry/tapestry4/branches/4.1.1-clientIds/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java?view=diff&rev=471451&r1=471450&r2=471451
==============================================================================
--- 
tapestry/tapestry4/branches/4.1.1-clientIds/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java
 (original)
+++ 
tapestry/tapestry4/branches/4.1.1-clientIds/tapestry-framework/src/java/org/apache/tapestry/form/FormSupportImpl.java
 Sun Nov  5 07:54:57 2006
@@ -393,7 +393,7 @@
         
         String filteredId = TapestryUtils.convertTapestryIdToNMToken(baseId);
 
-        String result = _elementIdAllocator.allocateId(filteredId);
+        String result = _elementIdAllocator.allocateId(filteredId + "_" + 
_form.getClientId());
         
         if (_rewinding)
         {


Reply via email to