From bb671489bbda01f9cde2eb9e63c32bb3897fc80f Mon Sep 17 00:00:00 2001 From: Nicolas Domenech Date: Wed, 1 Feb 2023 18:54:46 +0100 Subject: [PATCH] #140 [TimeSpent] fix: error user conf favorite task --- core/modules/modDoliSIRH.class.php | 1 - lib/dolisirh_function.lib.php | 8 ++++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/core/modules/modDoliSIRH.class.php b/core/modules/modDoliSIRH.class.php index af13e52..4c5a3ad 100644 --- a/core/modules/modDoliSIRH.class.php +++ b/core/modules/modDoliSIRH.class.php @@ -120,7 +120,6 @@ public function __construct($db) $i++ => array('DOLISIRH_HR_PROJECT_SET', 'integer', 0, '', 0, 'current'), // CONST TIME SPENT - $i++ => array('DOLISIRH_SHOW_ONLY_FAVORITE_TASKS', 'integer', 0, '', 0, 'current'), $i++ => array('DOLISIRH_SHOW_ONLY_TASKS_WITH_TIMESPENT_ON_TIMESHEET', 'integer', 0, '', 0, 'current'), // CONST TIME SHEET diff --git a/lib/dolisirh_function.lib.php b/lib/dolisirh_function.lib.php index 1849835..cf4d41b 100644 --- a/lib/dolisirh_function.lib.php +++ b/lib/dolisirh_function.lib.php @@ -593,21 +593,21 @@ function doliSirhGetTasksArray($usert = null, $userp = null, $projectid = 0, $so $sql .= ", ".MAIN_DB_PREFIX."element_contact as ec2"; $sql .= ", ".MAIN_DB_PREFIX."c_type_contact as ctc2"; } - if ($conf->global->DOLISIRH_SHOW_ONLY_FAVORITE_TASKS) { + if ($user->conf->DOLISIRH_SHOW_ONLY_FAVORITE_TASKS > 0) { $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."element_element as elel ON (t.rowid = elel.fk_target AND elel.targettype='project_task')"; } - if ($conf->global->DOLISIRH_SHOW_ONLY_TASKS_WITH_TIMESPENT) { + if ($user->conf->DOLISIRH_SHOW_ONLY_TASKS_WITH_TIMESPENT > 0) { $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_time as ptt ON (t.rowid = ptt.fk_task)"; } $sql .= " LEFT JOIN ".MAIN_DB_PREFIX."projet_task_extrafields as efpt ON (t.rowid = efpt.fk_object)"; $sql .= " WHERE p.entity IN (".getEntity('project').")"; $sql .= " AND t.fk_projet = p.rowid"; - if ($conf->global->DOLISIRH_SHOW_ONLY_FAVORITE_TASKS) { + if ($user->conf->DOLISIRH_SHOW_ONLY_FAVORITE_TASKS > 0) { $sql .= " AND elel.fk_target = t.rowid"; $sql .= " AND elel.fk_source = " . $filteronprojuser; } - if ($conf->global->DOLISIRH_SHOW_ONLY_TASKS_WITH_TIMESPENT) { + if ($user->conf->DOLISIRH_SHOW_ONLY_TASKS_WITH_TIMESPENT > 0) { $sql .= " AND ptt.fk_task = t.rowid AND ptt.fk_user = " . $filteronprojuser; if ($timeMode == 'month') { $sql .= " AND MONTH(ptt.task_date) = " . $timeArray['month'];