From 477b9c8338db343f810dcf545fc58bed6a86df37 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Mon, 2 Jan 2017 12:34:23 +0100 Subject: [PATCH] Fix duplicate view of agenda/events for projects --- htdocs/projet/class/project.class.php | 2 +- htdocs/projet/element.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/htdocs/projet/class/project.class.php b/htdocs/projet/class/project.class.php index 7a88fc3112c..460e698e432 100644 --- a/htdocs/projet/class/project.class.php +++ b/htdocs/projet/class/project.class.php @@ -1498,7 +1498,7 @@ class Project extends CommonObject { $sql="UPDATE ".MAIN_DB_PREFIX.$tableName; - if ($TableName=="actioncomm") + if ($tableName == "actioncomm") { $sql.= " SET fk_project=".$this->id; $sql.= " WHERE id=".$elementSelectId; diff --git a/htdocs/projet/element.php b/htdocs/projet/element.php index 3fd6bdbcd56..231765cd7c6 100644 --- a/htdocs/projet/element.php +++ b/htdocs/projet/element.php @@ -382,6 +382,7 @@ $listofreferent=array( 'buttonnew'=>'AddTimeSpent', 'testnew'=>$user->rights->projet->creer, 'test'=>($conf->projet->enabled && $user->rights->projet->lire && empty($conf->global->PROJECT_HIDE_TASKS))), +/* No need for this, available on dedicated tab "Agenda/Events" 'agenda'=>array( 'name'=>"Agenda", 'title'=>"ListActionsAssociatedProject", @@ -394,6 +395,7 @@ $listofreferent=array( 'buttonnew'=>'AddEvent', 'testnew'=>$user->rights->agenda->myactions->create, 'test'=>$conf->agenda->enabled && $user->rights->agenda->myactions->read), +*/ ); $parameters=array('listofreferent'=>$listofreferent);