Remove an over charge on js function getRequestData() use by layered-…

…modal link call when two links are present on the same page. Related to OFBIZ-6768 git-svn-id: https://svn.apache.org/repos/asf/ofbiz/trunk@1719868 13f79535-47bb-0310-9956-ffa450edef68
baohewei · Dec 14, 2015 · 0970875 · 0970875
1 parent ed8eddc
commit 0970875
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/framework/widget/templates/htmlFormMacroLibrary.ftl b/framework/widget/templates/htmlFormMacroLibrary.ftl
@@ -876,7 +876,7 @@ Parameter: tabindex, String, optional - HTML tabindex number.
         <#if style?has_content>class="${style}"</#if>>
         <#if description?has_content>${description}</#if></a>
         <script type="text/javascript">
-            function getRequestData () {
+            function ${uniqueItemName}_data () {
                 var data =  {
                     <#--list parameterList as parameter>
                         "${parameter.name}": "${parameter.value}",
@@ -899,7 +899,7 @@ Parameter: tabindex, String, optional - HTML tabindex number.
                          jQuery.ajax({
                              url: "${linkUrl}",
                              type: "POST",
-                             data: getRequestData(),
+                             data: ${uniqueItemName}_data(),
                              success: function(data) {jQuery("#${uniqueItemName}").html(data);}
                          });
                  }

diff --git a/framework/widget/templates/htmlMenuMacroLibrary.ftl b/framework/widget/templates/htmlMenuMacroLibrary.ftl
@@ -60,7 +60,7 @@ under the License.
     <#if style?has_content>class="${style}"</#if>>
     <#if text?has_content>${text}</#if></a>
 <script type="text/javascript">
-    function getRequestData () {
+    function ${uniqueItemName}_data() {
         var data =  {
                    <#--list parameterList as parameter>
                         "${parameter.name}": "${parameter.value}",
@@ -83,7 +83,7 @@ under the License.
                          jQuery.ajax({
                              url: "${linkUrl}",
                              type: "POST",
-                             data: getRequestData(),
+                             data: ${uniqueItemName}_data(),
                              success: function(data) {jQuery("#${uniqueItemName}").html(data);}
                          });
                  }

diff --git a/framework/widget/templates/htmlScreenMacroLibrary.ftl b/framework/widget/templates/htmlScreenMacroLibrary.ftl
@@ -113,7 +113,7 @@ under the License.
         <#if style?has_content>class="${style}"</#if>>
         <#if text?has_content>${text}</#if></a>
         <script type="text/javascript">
-            function getRequestData () {
+            function ${uniqueItemName}_data() {
                 var data =  {
                     <#list parameterList as parameter>
                         "${parameter.name}": "${parameter.value}",
@@ -137,7 +137,7 @@ under the License.
                          jQuery.ajax({
                              url: "${target}",
                              type: "POST",
-                             data: getRequestData(),
+                             data: ${uniqueItemName}_data(),
                              success: function(data) {jQuery("#${uniqueItemName}").html(data);}
                          });
                  }