From f54847e037db28b42cedffb84aa184adce0c0492 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sat, 2 Jul 2011 14:51:26 +0000 Subject: [PATCH] Add TODO To show way to make things simplest --- htdocs/contact/fiche.php | 12 ++++++------ htdocs/core/class/canvas.class.php | 7 ++++--- htdocs/societe/soc.php | 24 ++++++++++++------------ 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/htdocs/contact/fiche.php b/htdocs/contact/fiche.php index bce5dcea5fc..6fc5ef70e40 100644 --- a/htdocs/contact/fiche.php +++ b/htdocs/contact/fiche.php @@ -24,7 +24,7 @@ * \file htdocs/contact/fiche.php * \ingroup societe * \brief Card of a contact - * \version $Id: fiche.php,v 1.219 2011/07/02 14:35:22 eldy Exp $ + * \version $Id: fiche.php,v 1.220 2011/07/02 14:53:42 eldy Exp $ */ require("../main.inc.php"); @@ -327,26 +327,26 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) // ----------------------------------------- if ($action == 'create') { - $objcanvas->assign_post(); // Assign POST data + $objcanvas->assign_post(); // TODO: Put code of assign_post into assign_values to keep only assign_values $objcanvas->assign_values($action); // Set value for templates $objcanvas->display_canvas($action); // Show template } else if ($action == 'edit') { - $objcanvas->control->object=$objcanvas->getObject($id); // Load object + $objcanvas->control->object=$objcanvas->getObject($id); // TODO: Getting and storing object should be done into assign_values (for template with no code) or into tpl if (empty($objcanvas->control->object)) { $object = new Contact($db); $object->fetch($id,$user); $objcanvas->control->object=$object; } - $objcanvas->assign_post(); // Assign POST data + $objcanvas->assign_post(); // TODO: Put code of assign_post into assign_values to keep only assign_values $objcanvas->assign_values($action); // Set value for templates $objcanvas->display_canvas($action); // Show template } else { - $objcanvas->control->object=$objcanvas->getObject($id); // Load object + $objcanvas->control->object=$objcanvas->getObject($id); // TODO: Getting and storing object should be done into assign_values (for template with no code) or into tpl if (empty($objcanvas->control->object)) { $object = new Contact($db); @@ -974,5 +974,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/02 14:35:22 $ - $Revision: 1.219 $'); +llxFooter('$Date: 2011/07/02 14:53:42 $ - $Revision: 1.220 $'); ?> diff --git a/htdocs/core/class/canvas.class.php b/htdocs/core/class/canvas.class.php index 971a01af9d8..c2aa4c83e84 100644 --- a/htdocs/core/class/canvas.class.php +++ b/htdocs/core/class/canvas.class.php @@ -21,7 +21,7 @@ * \file htdocs/core/class/canvas.class.php * \ingroup core * \brief File of class to manage canvas - * \version $Id: canvas.class.php,v 1.43 2011/07/02 13:09:52 eldy Exp $ + * \version $Id: canvas.class.php,v 1.44 2011/07/02 14:51:26 eldy Exp $ */ @@ -230,11 +230,12 @@ class Canvas /** * Display canvas * @param mode 'create', 'view', 'edit' + * @param id Id of object to show */ - function display_canvas($mode='view') + function display_canvas($mode='view',$id=0) { global $db, $conf, $langs, $user, $canvas; - global $form, $formfile; + global $id, $form, $formfile; //print $this->template_dir.$this->card.'_'.$mode.'.tpl.php';exit; include($this->template_dir.$this->card.'_'.$mode.'.tpl.php'); // Include native PHP template diff --git a/htdocs/societe/soc.php b/htdocs/societe/soc.php index 18c85238a65..ed83535f983 100644 --- a/htdocs/societe/soc.php +++ b/htdocs/societe/soc.php @@ -26,7 +26,7 @@ * \file htdocs/societe/soc.php * \ingroup societe * \brief Third party card page - * \version $Id: soc.php,v 1.119 2011/07/02 14:35:22 eldy Exp $ + * \version $Id: soc.php,v 1.120 2011/07/02 14:51:27 eldy Exp $ */ require("../main.inc.php"); @@ -519,34 +519,34 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action)) // ----------------------------------------- if ($action == 'create') { - $objcanvas->assign_post(); // Assign POST data - $objcanvas->assign_values($action); // Set value for templates - $objcanvas->display_canvas($action); // Show template + $objcanvas->assign_post(); // TODO: Put code of assign_post into assign_values to keep only assign_values + $objcanvas->assign_values($action); // Set value for templates + $objcanvas->display_canvas($action,0); // Show template } elseif ($action == 'edit') { - $objcanvas->control->object=$objcanvas->getObject($socid); // Load object + $objcanvas->control->object=$objcanvas->getObject($socid); // TODO: Getting and storing object should be done into assign_values (for template with no code) or into tpl if (empty($objcanvas->control->object)) { $object = new Societe($db); $object->fetch($socid); $objcanvas->control->object=$object; } - $objcanvas->assign_post(); // Assign POST data - $objcanvas->assign_values($action); // Set value for templates - $objcanvas->display_canvas($action); // Show template + $objcanvas->assign_post(); // TODO: Put code of assign_post into assign_values to keep only assign_values + $objcanvas->assign_values($action); // Set value for templates + $objcanvas->display_canvas($action); // Show template } else { - $objcanvas->control->object=$objcanvas->getObject($socid); // Load object + $objcanvas->control->object=$objcanvas->getObject($socid); // TODO: Getting and storing object should be done into assign_values (for template with no code) or into tpl if (empty($objcanvas->control->object)) { $object = new Societe($db); $object->fetch($socid); $objcanvas->control->object=$object; } - $objcanvas->assign_values('view'); // Assign values - $objcanvas->display_canvas('view'); // Show template + $objcanvas->assign_values('view'); + $objcanvas->display_canvas('view'); // Show template } } else @@ -1972,5 +1972,5 @@ else $db->close(); -llxFooter('$Date: 2011/07/02 14:35:22 $ - $Revision: 1.119 $'); +llxFooter('$Date: 2011/07/02 14:51:27 $ - $Revision: 1.120 $'); ?> \ No newline at end of file