From 9ee6fdd163cd2304ff1957a1913b9e082c16b531 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 31 Mar 2015 21:07:17 +0200 Subject: [PATCH 1/3] Tooltip of actioncomm show empty ref --- htdocs/comm/action/class/actioncomm.class.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 37758eea2ab..900fea2d079 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -970,7 +970,10 @@ class ActionComm extends CommonObject $result=''; $tooltip = '' . $langs->trans('ShowAction'.$objp->code) . ''; - $tooltip .= '
' . $langs->trans('Ref') . ': ' . $this->label; + if (! empty($this->ref)) + $tooltip .= '
' . $langs->trans('Ref') . ': ' . $this->label; + if (! empty($this->label)) + $tooltip .= '
' . $langs->trans('Title') . ': ' . $this->label; $label = $this->label; if (empty($label)) $label=$this->libelle; // For backward compatibility $linkclose = '" title="'.dol_escape_htmltag($tooltip, 1).'" class="classfortooltip">'; From f0ed848609528e0aec2effdde7be5a66b727b615 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 31 Mar 2015 21:38:38 +0200 Subject: [PATCH 2/3] Update actioncomm.class.php --- htdocs/comm/action/class/actioncomm.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index 900fea2d079..cd91203c32e 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -971,7 +971,7 @@ class ActionComm extends CommonObject $result=''; $tooltip = '' . $langs->trans('ShowAction'.$objp->code) . ''; if (! empty($this->ref)) - $tooltip .= '
' . $langs->trans('Ref') . ': ' . $this->label; + $tooltip .= '
' . $langs->trans('Ref') . ': ' . $this->ref; if (! empty($this->label)) $tooltip .= '
' . $langs->trans('Title') . ': ' . $this->label; $label = $this->label; From 08e7cb2e8488b323df50a6566c5e73ec20992218 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20FRANCE?= Date: Tue, 31 Mar 2015 21:57:48 +0200 Subject: [PATCH 3/3] Correction for tooltip --- htdocs/comm/action/class/actioncomm.class.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/htdocs/comm/action/class/actioncomm.class.php b/htdocs/comm/action/class/actioncomm.class.php index cd91203c32e..f3086408d4e 100644 --- a/htdocs/comm/action/class/actioncomm.class.php +++ b/htdocs/comm/action/class/actioncomm.class.php @@ -976,9 +976,9 @@ class ActionComm extends CommonObject $tooltip .= '
' . $langs->trans('Title') . ': ' . $this->label; $label = $this->label; if (empty($label)) $label=$this->libelle; // For backward compatibility - $linkclose = '" title="'.dol_escape_htmltag($tooltip, 1).'" class="classfortooltip">'; - if ($option=='birthday') $link = ''; + if ($option=='birthday') $link = '