diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php index 10c91b8dd440b19c56fe32308f9a8477cf4143ad..0b6b6f9cf7cb3b40664ab779a0ab6dac8015e4f3 100644 --- a/htdocs/comm/propal.php +++ b/htdocs/comm/propal.php @@ -1167,7 +1167,7 @@ if ($_GET['propalid'] > 0) if ($conf->use_ajax && $conf->global->MAIN_CONFIRM_AJAX) { $url = $_SERVER["PHP_SELF"].'?propalid='.$propal->id.'&ligne='.$objp->rowid.'&action=confirm_deleteline&confirm=yes'; - print '<a href="#" onClick="dialogConfirm(\''.$url.'\',\''.$langs->trans('ConfirmDeleteProductLine').'\',\''.$langs->trans("Yes").'\',\''.$langs->trans("No").'\')">'; + print '<a href="#" onClick="dialogConfirm(\''.$url.'\',\''.$langs->trans('ConfirmDeleteProductLine').'\',\''.$langs->trans("Yes").'\',\''.$langs->trans("No").'\',\'deleteline'.$i.'\')">'; print img_delete(); } else @@ -1461,7 +1461,7 @@ if ($_GET['propalid'] > 0) if ($conf->use_ajax && $conf->global->MAIN_CONFIRM_AJAX) { $url = $_SERVER["PHP_SELF"].'?propalid='.$propal->id.'&action=confirm_validate&confirm=yes'; - print 'href="#" onClick="dialogConfirm(\''.$url.'\',\''.$langs->trans('ConfirmValidateProp').'\',\''.$langs->trans("Yes").'\',\''.$langs->trans("No").'\')"'; + print 'href="#" onClick="dialogConfirm(\''.$url.'\',\''.$langs->trans('ConfirmValidateProp').'\',\''.$langs->trans("Yes").'\',\''.$langs->trans("No").'\',\'validate\')"'; } else { @@ -1526,7 +1526,7 @@ if ($_GET['propalid'] > 0) if ($conf->use_ajax && $conf->global->MAIN_CONFIRM_AJAX) { $url = $_SERVER["PHP_SELF"].'?propalid='.$propal->id.'&action=confirm_delete&confirm=yes'; - print 'href="#" onClick="dialogConfirm(\''.$url.'\',\''.$langs->trans('ConfirmDeleteProp').'\',\''.$langs->trans("Yes").'\',\''.$langs->trans("No").'\')"'; + print 'href="#" onClick="dialogConfirm(\''.$url.'\',\''.$langs->trans('ConfirmDeleteProp').'\',\''.$langs->trans("Yes").'\',\''.$langs->trans("No").'\',\'delete\')"'; } else { diff --git a/htdocs/lib/lib_head.js b/htdocs/lib/lib_head.js index be334f71202aed251390713c41146ec37d266299..5e1fb876693597a8e848a2c0de91ab693331c871 100644 --- a/htdocs/lib/lib_head.js +++ b/htdocs/lib/lib_head.js @@ -652,16 +652,17 @@ function cleanSerialize(expr) { /*================================================================= Purpose: Affiche un message de confirmation - Input: linkurl,message,ok,cancel + Input: linkurl,message,ok,cancel,objectID Author: Regis Houssin Licence: GPL ==================================================================*/ -function dialogConfirm(linkurl,message,ok,cancel) { +function dialogConfirm(linkurl,message,ok,cancel,objectID) { Dialog.confirm(message, { width:300, okLabel: ok, cancelLabel: cancel, buttonClass: "button", + id: objectID, cancel:function(win){}, ok:function(win) {window.location.href=linkurl; return true;} });