Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-04 16:12:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: ajout identifiant afin d'viter les conflits

Browse Source
This commit is contained in:
Regis Houssin
2007-08-09 19:50:39 +00:00
parent 8ff49a5bcf
commit ebcab1ead2
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/comm/propal.php
View File

@@ -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
{

5
htdocs/lib/lib_head.js
View File

@@ -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;}
});