diff --git a/htdocs/core/lib/project.lib.php b/htdocs/core/lib/project.lib.php index ee024c60c2a19e0dfbfcb9443f537d07a8e51f49..1bf4c9531dff708d026903327033447834e4228f 100644 --- a/htdocs/core/lib/project.lib.php +++ b/htdocs/core/lib/project.lib.php @@ -541,8 +541,8 @@ function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$t { $projectstatic->id=$lines[$i]->fk_project; $projectstatic->ref=$lines[$i]->projectref; + $projectstatic->title=$lines[$i]->projectlabel; $projectstatic->public=$lines[$i]->public; - $projectstatic->label=$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]; $taskstatic->id=$lines[$i]->id; @@ -550,7 +550,7 @@ function projectLinesPerDay(&$inc, $parent, $lines, &$level, &$projectsrole, &$t // Project print "<td>"; - print $projectstatic->getNomUrl(1); + print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]); print "</td>"; // Ref @@ -711,9 +711,9 @@ function projectLinesPerWeek(&$inc, $firstdaytoshow, $fuser, $parent, $lines, &$ print '<td class="nowrap">'; $projectstatic->id=$lines[$i]->fk_project; $projectstatic->ref=$lines[$i]->projectref; + $projectstatic->title=$lines[$i]->projectlabel; $projectstatic->public=$lines[$i]->public; - $projectstatic->label=$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]; - print $projectstatic->getNomUrl(1); + print $projectstatic->getNomUrl(1,'',0,$langs->transnoentitiesnoconv("YourRole").': '.$projectsrole[$lines[$i]->fk_project]); print "</td>"; // Ref diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index ff005dd088f3578f3f23f22bcc2cdb252494bc92..a819577085f3116cb14d5d8492351d86f22ccb2c 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -818,9 +818,10 @@ class Project extends CommonObject * @param int $withpicto 0=No picto, 1=Include picto into link, 2=Only picto * @param string $option Variant ('', 'nolink') * @param int $addlabel 0=Default, 1=Add label into string, >1=Add first chars into string + * @param string $moreinpopup Text to add into popu * @return string Chaine avec URL */ - function getNomUrl($withpicto=0, $option='', $addlabel=0) + function getNomUrl($withpicto=0, $option='', $addlabel=0, $moreinpopup='') { global $langs; @@ -831,7 +832,8 @@ class Project extends CommonObject if (! empty($this->ref)) $label .= '<br><b>' . $langs->trans('Ref') . ':</b> ' . $this->ref; if (! empty($this->title)) - $label .= '<br><b>' . $langs->trans('Name') . ':</b> ' . $this->title; + $label .= '<br><b>' . $langs->trans('Label') . ':</b> ' . $this->title; + if ($moreinpopup) $label.='<br>'.$moreinpopup; $linkclose = '" title="'.dol_escape_htmltag($label, 1).'" class="classfortooltip">'; if ($option != 'nolink') {