From 0f65e87b1662a059c0b4757890b64bcb157a4306 Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Sun, 5 Sep 2010 18:19:58 +0000 Subject: [PATCH] Works on canvas integration in third party module --- htdocs/core/class/canvas.class.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php index ed8a3f439c1..7a4e46bcb60 100644 --- a/htdocs/core/class/canvas.class.php +++ b/htdocs/core/class/canvas.class.php @@ -119,8 +119,8 @@ class Canvas $this->canvas = $regs[1]; // For compatibility - if ($this->module == 'thirdparty') $childmodule = $this->aliasmodule = 'societe'; - if ($this->targetmodule == 'thirdparty') $targetmodule = $this->aliastargetmodule = 'societe'; + if ($childmodule == 'thirdparty') $childmodule = $this->aliasmodule = 'societe'; + if ($targetmodule == 'thirdparty') $targetmodule = 'societe'; } //print 'childmodule='.$childmodule.' targetmodule='.$targetmodule.'
'; @@ -139,11 +139,11 @@ class Canvas $controlclassfile = DOL_DOCUMENT_ROOT.'/'.$this->aliasmodule.'/canvas/'.$this->canvas.'/'.$this->card.'.'.$this->canvas.'.class.php'; include_once($controlclassfile); - // Instantiate canvas controller class + // Instantiate actions class (controller) $controlclassname = ucfirst($this->card).ucfirst($this->canvas); $this->control = new $controlclassname($this->db); - // Instantiate model class + // Instantiate dataservice class (model) $modelclassname = ucfirst($this->targetmodule).ucfirst($this->canvas); $this->control->object = new $modelclassname($this->db);