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

Fix: regression

Browse Source
This commit is contained in:
Laurent Destailleur 2012-08-28 23:01:04 +02:00
parent 745b35f94e
commit 8a74c928f3
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
htdocs/product/class/product.class.php
View File

@ -698,7 +698,13 @@ class Product extends CommonObject
$sql2.= "','".$this->db->escape($this->description); $sql2.= "','".$this->db->escape($this->description);
$sql2.= "','".$this->db->escape($this->note)."')"; $sql2.= "','".$this->db->escape($this->note)."')";
} }
if (!$this->db->query($sql2)) return -1; dol_syslog(get_class($this).'::setMultiLangs sql='.$sql2);
if (! $this->db->query($sql2))
{
$this->error=$this->db->lasterror();
dol_syslog(get_class($this).'::setMultiLangs error='.$this->error, LOG_ERR);
return -1;
}
} }
else if (isset($this->multilangs["$key"])) else if (isset($this->multilangs["$key"]))
{ {
@ -720,7 +726,13 @@ class Product extends CommonObject
// on ne sauvegarde pas des champs vides // on ne sauvegarde pas des champs vides
if ( $this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"] || $this->multilangs["$key"]["note"] ) if ( $this->multilangs["$key"]["label"] || $this->multilangs["$key"]["description"] || $this->multilangs["$key"]["note"] )
if (!$this->db->query($sql2)) return -1; dol_syslog(get_class($this).'::setMultiLangs sql='.$sql2);
if (! $this->db->query($sql2))
{
$this->error=$this->db->lasterror();
dol_syslog(get_class($this).'::setMultiLangs error='.$this->error, LOG_ERR);
return -1;
}
} }
} }
return 1; return 1;

7
htdocs/product/traduction.php
View File

@ -55,6 +55,7 @@ if ($cancel == $langs->trans("Cancel"))
$action = ''; $action = '';
} }
// Validation de l'ajout // Validation de l'ajout
if ($action == 'vadd' && if ($action == 'vadd' &&
$cancel != $langs->trans("Cancel") && $cancel != $langs->trans("Cancel") &&
@ -103,7 +104,7 @@ $cancel != $langs->trans("Cancel") &&
{ {
if ( $key == $current_lang ) if ( $key == $current_lang )
{ {
$product->lable = $_POST["libelle-".$key]; $product->label = $_POST["libelle-".$key];
$product->description = dol_htmlcleanlastbr($_POST["desc-".$key]); $product->description = dol_htmlcleanlastbr($_POST["desc-".$key]);
$product->note = dol_htmlcleanlastbr($_POST["note-".$key]); $product->note = dol_htmlcleanlastbr($_POST["note-".$key]);
} }
@ -163,7 +164,7 @@ if ($action == 'edit')
//WYSIWYG Editor //WYSIWYG Editor
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
print '<form action="" method="POST">'; print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="vedit">'; print '<input type="hidden" name="action" value="vedit">';
print '<input type="hidden" name="id" value="'.$product->id.'">'; print '<input type="hidden" name="id" value="'.$product->id.'">';
@ -250,7 +251,7 @@ if ($action == 'add' && ($user->rights->produit->creer || $user->rights->service
require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php'; require_once DOL_DOCUMENT_ROOT.'/core/class/doleditor.class.php';
print '<br>'; print '<br>';
print '<form action="" method="post">'; print '<form action="'.$_SERVER["PHP_SELF"].'" method="post">';
print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">'; print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
print '<input type="hidden" name="action" value="vadd">'; print '<input type="hidden" name="action" value="vadd">';
print '<input type="hidden" name="id" value="'.$_GET["id"].'">'; print '<input type="hidden" name="id" value="'.$_GET["id"].'">';