svn commit: r1533752 - in /ofbiz/branches/release12.04: ./ framework/common/widget/SecurityForms.xml

Author: jleroux
Date: Sat Oct 19 13:04:40 2013
New Revision: 1533752

URL: http://svn.apache.org/r1533752
Log:
"Applied fix from trunk for revision: 1497839"
------------------------------------------------------------------------
r1497839 | jleroux | 2013-06-28 18:46:18 +0200 (ven. 28 juin 2013) | 5 lignes

A patch from Arpit Singh Pandya for "Cancel/Done is not working correctly on Create User Login page." https://issues.apache.org/jira/browse/OFBIZ-5252

When we navigate on create user login page from party profile on clicking "Create New" link in User Name(s) Section, "Cancel/Done" is not working correctly on Create User Login page. partyId is missing with link. It is not working on trunk and 12.04, not sure about other versions.

jleroux: 11.04 is concerned, 10.04 is OK
------------------------------------------------------------------------


Modified:
    ofbiz/branches/release12.04/   (props changed)
    ofbiz/branches/release12.04/framework/common/widget/SecurityForms.xml

Propchange: ofbiz/branches/release12.04/
------------------------------------------------------------------------------
  Merged /ofbiz/trunk:r1497839

Modified: ofbiz/branches/release12.04/framework/common/widget/SecurityForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/common/widget/SecurityForms.xml?rev=1533752&r1=1533751&r2=1533752&view=diff
==============================================================================
--- ofbiz/branches/release12.04/framework/common/widget/SecurityForms.xml (original)
+++ ofbiz/branches/release12.04/framework/common/widget/SecurityForms.xml Sat Oct 19 13:04:40 2013
@@ -76,7 +76,11 @@ under the License.
             </drop-down>
         </field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
-        <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"><hyperlink target="${cancelPage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+        <field name="cancelLink" title=" " widget-style="smallSubmit">
+            <hyperlink target="${cancelPage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+                <parameter param-name="partyId"/>
+            </hyperlink>
+        </field>
     </form>
 
     <form name="AddUserLoginSecurityGroup" type="single" target="${addUserLoginSecurityGroupURI}"
@@ -108,7 +112,11 @@ under the License.
         <field name="groupId" title="${uiLabelMap.CommonSecurityGroupId}" widget-style="required" tooltip="${uiLabelMap.CommonRequired}"><text size="20" maxlength="20"/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><text size="60" maxlength="250"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/></field>
-        <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit"><hyperlink target="${cancelPage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
+        <field name="cancelLink" title=" " widget-style="smallSubmit">
+            <hyperlink target="${cancelPage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}">
+                <parameter param-name="partyId"/>
+            </hyperlink>
+        </field>
     </form>
 
     <form name="EditSecurityGroup" type="single" target="updateSecurityGroup" default-map-name="securityGroup">