From ebcab1ead290135d8e55aca913d304c7bfce34b2 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Thu, 9 Aug 2007 19:50:39 +0000
Subject: [PATCH] =?UTF-8?q?Fix:=20ajout=20identifiant=20afin=20d'=E9viter?=
=?UTF-8?q?=20les=20conflits?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
htdocs/comm/propal.php | 6 +++---
htdocs/lib/lib_head.js | 5 +++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/htdocs/comm/propal.php b/htdocs/comm/propal.php
index 10c91b8dd44..0b6b6f9cf7c 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 be334f71202..5e1fb876693 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;}
});
--
GitLab