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

Merge pull request #24365 from frederic34/ajaxtooltip

Browse Source 
fix tooltip ajax
This commit is contained in:
Laurent Destailleur 2023-03-28 21:45:39 +02:00 committed by GitHub
commit 64ef6fe4ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/categories/class/categorie.class.php
View File

@ -1624,6 +1624,8 @@ class Categorie extends CommonObject
{
global $langs;
$langs->load('categories');
$datas = [];
$datas['label'] = $langs->trans("ShowCategory").': '.($this->ref ? $this->ref : $this->label);
@ -1656,7 +1658,6 @@ class Categorie extends CommonObject
if (getDolGlobalInt('MAIN_ENABLE_AJAX_TOOLTIP')) {
$classfortooltip = 'classforajaxtooltip';
$dataparams = ' data-params='.json_encode($params);
// $label = $langs->trans('Loading');
}
$label = implode($this->getTooltipContentArray($params));

17
htdocs/core/lib/functions.lib.php
View File

@ -11244,11 +11244,21 @@ function getElementProperties($element_type)
$classpath = 'comm/action/class';
$subelement = 'Actioncomm';
$module = 'agenda';
} elseif ($element_type == 'adherent_type') {
$classpath = 'adherents/class';
$classfile = 'adherent_type';
$module = 'adherent';
$subelement = 'adherent_type';
$classname = 'AdherentType';
} elseif ($element_type == 'bank_account') {
$classpath = 'compta/bank/class';
$module = 'banque';
$classfile = 'Account';
$classname = 'Account';
} elseif ($element_type == 'category') {
$classpath = 'categories/class';
$module = 'categorie';
$subelement = 'categorie';
} elseif ($element_type == 'stock') {
$classpath = 'product/stock/class';
$classfile = 'entrepot';
@ -11272,6 +11282,10 @@ function getElementProperties($element_type)
$classpath = 'comm/propal/class';
} elseif ($element_type == 'supplier_proposal') {
$classpath = 'supplier_proposal/class';
$module = 'supplier_proposal';
$element = 'supplierproposal';
$classfile = 'supplier_proposal';
$subelement = 'supplierproposal';
} elseif ($element_type == 'shipping') {
$classpath = 'expedition/class';
$subelement = 'expedition';
@ -11321,6 +11335,9 @@ function getElementProperties($element_type)
} elseif ($element_type == "service") {
$classpath = 'product/class';
$subelement = 'product';
} elseif ($objecttype == 'salary') {
$classpath = 'salaries/class';
$module = 'salaries';
}
if (empty($classfile)) {

3
htdocs/supplier_proposal/class/supplier_proposal.class.php
View File

@ -2477,6 +2477,9 @@ class SupplierProposal extends CommonObject
public function getTooltipContentArray($params)
{
global $conf, $langs, $menumanager;
$langs->load('supplier_proposal');
if (!empty($conf->global->MAIN_OPTIMIZEFORTEXTBROWSER)) {
return ['optimize' => $langs->trans("ShowSupplierProposal")];
}