diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php index bd8a444958..4f26792be5 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -170,8 +170,8 @@ createLink('task', 'view', "taskID=$child->id", '', '', $child->project), $child->name, null, "style='color: $child->color'");?> systemMode == 'new'):?> - execution]->name) ? $projects[$child->execution]->name : '';?> - execution]->id) ? $projects[$child->execution]->id : 0;?> + execution]->name) ? $projects[$child->execution]->name : '';?> + execution]->id) ? $projects[$child->execution]->id : 0;?> createLink('project', 'view', "projectID=$projectID"), $projectName) : '';?> diff --git a/module/user/model.php b/module/user/model.php index 1e550c2519..3fb2ca10a0 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -102,6 +102,7 @@ class userModel extends model ->beginIF(strpos($params, 'nodeleted') !== false or empty($this->config->user->showDeleted))->andWhere('deleted')->eq('0')->fi() ->beginIF(strpos($params, 'all') === false)->andWhere('type')->eq($type)->fi() ->beginIF($accounts)->andWhere('account')->in($accounts)->fi() + ->beginIF($this->config->vision)->andWhere("CONCAT(',', visions, ',') like '%,{$this->config->vision},%'")->fi() ->orderBy($orderBy) ->beginIF($maxCount)->limit($maxCount)->fi() ->fetchAll($keyField);