ClientJS: Daten bei AJAX-Submits als POST-Content schicken, nicht an die URL dran

diff --git a/js/client_js.js b/js/client_js.js
index e096d5236177ab01898f381cdb692ec014d02170..51e3638cdf4cc2d6fd27d03b78f6fc9c3dda02bf 100644 (file)
--- a/js/client_js.js
+++ b/js/client_js.js
@@ -129,8 +129,15 @@ ns.eval_json_result = function(data) {
 };
 
 ns.submit_ajax_form = function(url, form_selector, additional_data) {
 };
 
 ns.submit_ajax_form = function(url, form_selector, additional_data) {

-  var separator = /\?/.test(url) ? '&' : '?';
-  $.post(url + separator + $(form_selector).serialize(), additional_data, ns.eval_json_result);
+  var data = $(form_selector).serialize();
+  if (additional_data) {
+    if (data)
+      data += '&';
+    data += typeof additional_data == "string" ? additional_data : $(additional_data).serialize();
+  }
+
+  $.post(url, data, ns.eval_json_result);
+

   return true;
 };
 
   return true;
 };
 

diff --git a/scripts/generate_client_js_actions.tpl b/scripts/generate_client_js_actions.tpl
index 6772cd10284705e429cf2439f88d8bcf33212d20..b2ab0460cf9eba5f54bb048c580d962f92541aa8 100644 (file)
--- a/scripts/generate_client_js_actions.tpl
+++ b/scripts/generate_client_js_actions.tpl
@@ -36,8 +36,15 @@ ns.eval_json_result = function(data) {
 };
 
 ns.submit_ajax_form = function(url, form_selector, additional_data) {
 };
 
 ns.submit_ajax_form = function(url, form_selector, additional_data) {

-  var separator = /\?/.test(url) ? '&' : '?';
-  $.post(url + separator + $(form_selector).serialize(), additional_data, ns.eval_json_result);
+  var data = $(form_selector).serialize();
+  if (additional_data) {
+    if (data)
+      data += '&';
+    data += typeof additional_data == "string" ? additional_data : $(additional_data).serialize();
+  }
+
+  $.post(url, data, ns.eval_json_result);
+

   return true;
 };
 
   return true;
 };