lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

send formconfirm as a POST

Browse Source
This commit is contained in:
Thomas Negre 2022-07-07 17:05:47 +02:00
parent 1a31704e18
commit c6bc767834
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
htdocs/core/class/html.form.class.php
View File

@ -5148,8 +5148,9 @@ class Form
closeOnEscape: false, closeOnEscape: false,
buttons: { buttons: {
"'.dol_escape_js($langs->transnoentities($labelbuttonyes)).'": function() { "'.dol_escape_js($langs->transnoentities($labelbuttonyes)).'": function() {
var options = "&token='.urlencode(newToken()).'"; var options = "token='.urlencode(newToken()).'";
var inputok = '.json_encode($inputok).'; /* List of fields into form */ var inputok = '.json_encode($inputok).'; /* List of fields into form */
var page = "'.dol_escape_js(!empty($page) ? $page : '').'";
var pageyes = "'.dol_escape_js(!empty($pageyes) ? $pageyes : '').'"; var pageyes = "'.dol_escape_js(!empty($pageyes) ? $pageyes : '').'";
if (inputok.length>0) { if (inputok.length>0) {
$.each(inputok, function(i, inputname) { $.each(inputok, function(i, inputname) {
@ -5166,12 +5167,20 @@ class Form
options += "&" + inputname + "=" + encodeURIComponent(inputvalue); options += "&" + inputname + "=" + encodeURIComponent(inputvalue);
}); });
} }
var urljump = pageyes + (pageyes.indexOf("?") < 0 ? "?" : "") + options; if (pageyes.length > 0) {
if (pageyes.length > 0) { location.href = urljump; } console.log(page);
console.log(pageyes);
console.log(options);
var post = $.post(
pageyes,
options,
() => {location.assign(page)}
);
}
$(this).dialog("close"); $(this).dialog("close");
}, },
"'.dol_escape_js($langs->transnoentities($labelbuttonno)).'": function() { "'.dol_escape_js($langs->transnoentities($labelbuttonno)).'": function() {
var options = "&token='.urlencode(newToken()).'"; var options = "token='.urlencode(newToken()).'";
var inputko = '.json_encode($inputko).'; /* List of fields into form */ var inputko = '.json_encode($inputko).'; /* List of fields into form */
var pageno="'.dol_escape_js(!empty($pageno) ? $pageno : '').'"; var pageno="'.dol_escape_js(!empty($pageno) ? $pageno : '').'";
if (inputko.length>0) { if (inputko.length>0) {
@ -5183,9 +5192,15 @@ class Form
options += "&" + inputname + "=" + encodeURIComponent(inputvalue); options += "&" + inputname + "=" + encodeURIComponent(inputvalue);
}); });
} }
var urljump=pageno + (pageno.indexOf("?") < 0 ? "?" : "") + options; if (pageno.length > 0) {
//alert(urljump); console.log(pageno);
if (pageno.length > 0) { location.href = urljump; } console.log(options);
var post = $.post(
pageno,
options,
() => {location.assign(page)}
);
}
$(this).dialog("close"); $(this).dialog("close");
} }
} }