lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add TODO To show way to make things simplest

Browse Source
This commit is contained in:
Laurent Destailleur 2011-07-02 14:51:26 +00:00
parent 2268de9898
commit f54847e037
3 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/contact/fiche.php
View File

@ -24,7 +24,7 @@
* \file htdocs/contact/fiche.php * \file htdocs/contact/fiche.php
* \ingroup societe * \ingroup societe
* \brief Card of a contact * \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"); require("../main.inc.php");
@ -327,26 +327,26 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
// ----------------------------------------- // -----------------------------------------
if ($action == 'create') 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->assign_values($action); // Set value for templates
$objcanvas->display_canvas($action); // Show template $objcanvas->display_canvas($action); // Show template
} }
else if ($action == 'edit') 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)) if (empty($objcanvas->control->object))
{ {
$object = new Contact($db); $object = new Contact($db);
$object->fetch($id,$user); $object->fetch($id,$user);
$objcanvas->control->object=$object; $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->assign_values($action); // Set value for templates
$objcanvas->display_canvas($action); // Show template $objcanvas->display_canvas($action); // Show template
} }
else 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)) if (empty($objcanvas->control->object))
{ {
$object = new Contact($db); $object = new Contact($db);
@ -974,5 +974,5 @@ else
$db->close(); $db->close();
llxFooter('$Date: 2011/07/02 14:35:22 $ - $Revision: 1.219 $'); llxFooter('$Date: 2011/07/02 14:53:42 $ - $Revision: 1.220 $');
?> ?>

7
htdocs/core/class/canvas.class.php
View File

@ -21,7 +21,7 @@
* \file htdocs/core/class/canvas.class.php * \file htdocs/core/class/canvas.class.php
* \ingroup core * \ingroup core
* \brief File of class to manage canvas * \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 * Display canvas
* @param mode 'create', 'view', 'edit' * @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 $db, $conf, $langs, $user, $canvas;
global $form, $formfile; global $id, $form, $formfile;
//print $this->template_dir.$this->card.'_'.$mode.'.tpl.php';exit; //print $this->template_dir.$this->card.'_'.$mode.'.tpl.php';exit;
include($this->template_dir.$this->card.'_'.$mode.'.tpl.php'); // Include native PHP template include($this->template_dir.$this->card.'_'.$mode.'.tpl.php'); // Include native PHP template

16
htdocs/societe/soc.php
View File

@ -26,7 +26,7 @@
* \file htdocs/societe/soc.php * \file htdocs/societe/soc.php
* \ingroup societe * \ingroup societe
* \brief Third party card page * \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"); require("../main.inc.php");
@ -519,33 +519,33 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
// ----------------------------------------- // -----------------------------------------
if ($action == 'create') 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->assign_values($action); // Set value for templates
$objcanvas->display_canvas($action); // Show template $objcanvas->display_canvas($action,0); // Show template
} }
elseif ($action == 'edit') 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)) if (empty($objcanvas->control->object))
{ {
$object = new Societe($db); $object = new Societe($db);
$object->fetch($socid); $object->fetch($socid);
$objcanvas->control->object=$object; $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->assign_values($action); // Set value for templates
$objcanvas->display_canvas($action); // Show template $objcanvas->display_canvas($action); // Show template
} }
else 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)) if (empty($objcanvas->control->object))
{ {
$object = new Societe($db); $object = new Societe($db);
$object->fetch($socid); $object->fetch($socid);
$objcanvas->control->object=$object; $objcanvas->control->object=$object;
} }
$objcanvas->assign_values('view'); // Assign values $objcanvas->assign_values('view');
$objcanvas->display_canvas('view'); // Show template $objcanvas->display_canvas('view'); // Show template
} }
} }
@ -1972,5 +1972,5 @@ else
$db->close(); $db->close();
llxFooter('$Date: 2011/07/02 14:35:22 $ - $Revision: 1.119 $'); llxFooter('$Date: 2011/07/02 14:51:27 $ - $Revision: 1.120 $');
?> ?>