vignesh/dolibarr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '19.0' of git@github.com:Dolibarr/dolibarr.git into 20.0

Browse source
This commit is contained in:
Laurent Destailleur 2024-06-25 15:13:51 +02:00
commit bd2a0b9e55
3 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
htdocs/core/class/commonobject.class.php
View file

@ -8739,7 +8739,14 @@ abstract class CommonObject
$classname = $InfoFieldList[0];
$classpath = $InfoFieldList[1];
if (!$validate->isFetchable($fieldValue, $classname, $classpath)) {
$this->setFieldError($fieldKey, $validate->error);
$lastIsFetchableError = $validate->error;
// from V19 of Dolibarr, In some cases link use element instead of class, example project_task
if ($validate->isFetchableElement($fieldValue, $classname)) {
return true;
}
$this->setFieldError($fieldKey, $lastIsFetchableError);
return false;
} else {
return true;

16
htdocs/core/class/validate.class.php
View file

@ -335,4 +335,20 @@ class Validate
}
return false;
}
/**
* Check for all values in db for an element
* @see self::isFetchable()
*
* @param integer $id of element
* @param string $element_type the element type
* @return boolean Validity is ok or not
* @throws Exception
*/
public function isFetchableElement($id, $element_type)
{
// TODO use newObjectByElement() introduce in V20 by PR #30036 for better errors management
$elementProperty = getElementProperties($element_type);
return $this->isFetchable($id, $elementProperty['classname'], $elementProperty['classpath'].'/'.$elementProperty['classfile'].'.class.php');
}
}

4
htdocs/core/db/DoliDB.class.php
View file

@ -201,8 +201,10 @@ abstract class DoliDB implements Database
$this->transaction_opened++;
dol_syslog("BEGIN Transaction".($textinlog ? ' '.$textinlog : ''), LOG_DEBUG);
dol_syslog('', 0, 1);
return 1;
} else {
return 0;
}
return (int) $ret;
} else {
$this->transaction_opened++;
dol_syslog('', 0, 1);