Sur la branche master: Add project info in events attached to a project

Befox · Oct 9, 2020 · 18ffc4f · 18ffc4f
1 parent f2aa870
commit 18ffc4f
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/cdav.lib.php b/lib/cdav.lib.php
@@ -73,7 +73,7 @@ public function getSqlCalEvents($calid, $oid=false, $ouri=false)
 					LEFT JOIN '.MAIN_DB_PREFIX.'actioncomm_cdav AS ac ON (a.id = ac.fk_object)';
 		}
 
-		$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'projet AS p ON (p.rowid = ac.fk_project)
+		$sql.=' LEFT JOIN '.MAIN_DB_PREFIX.'projet AS p ON (p.rowid = a.fk_project)
 				LEFT JOIN '.MAIN_DB_PREFIX.'c_country as co ON co.rowid = sp.fk_pays
 				LEFT JOIN '.MAIN_DB_PREFIX.'c_country as cos ON cos.rowid = s.fk_pays
 				WHERE 	a.id IN (SELECT ar.fk_actioncomm FROM '.MAIN_DB_PREFIX.'actioncomm_resources ar WHERE ar.element_type=\'user\' AND ar.fk_element='.intval($calid).')