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

New: Can use templates only canvas without controllers.

Browse Source
This commit is contained in:
Laurent Destailleur 2011-05-29 18:44:49 +00:00
parent 8d66d2da7e
commit a6784f461e
4 changed files with 49 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/contact/class/contact.class.php
View File

@ -85,12 +85,9 @@ class Contact extends CommonObject
* @param DB Habler d'acces base * @param DB Habler d'acces base
* @param id Id contact * @param id Id contact
*/ */
function Contact($DB, $id=0) function Contact($DB)
{ {
$this->db = $DB; $this->db = $DB;
$this->id = $id;
return 1;
} }
/** /**
@ -437,7 +434,7 @@ class Contact extends CommonObject
/* /*
* \brief Charge l'objet contact * \brief Charge l'objet contact
* \param id id du contact * \param id id du contact
* \param user Utilisateur abonnes aux alertes si on veut les alertes de ce contact * \param user Utilisateur (abonnes aux alertes) qui veut les alertes de ce contact
* \return int -1 if KO, 0 if OK but not found, 1 if OK * \return int -1 if KO, 0 if OK but not found, 1 if OK
*/ */
function fetch($id, $user=0) function fetch($id, $user=0)

20
htdocs/contact/fiche.php
View File

@ -313,16 +313,26 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
} }
else if ($action == 'edit') else if ($action == 'edit')
{ {
$objcanvas->fetch($id); // Reload object $objcanvas->control->object=$objcanvas->getObject($socid); // Load object
if (! empty($_POST)) { if (empty($objcanvas->control->object))
$objcanvas->assign_post(); // Assign POST data {
$object = new Contact($db);
$object->fetch($id,$user);
$objcanvas->control->object=$object;
} }
$objcanvas->assign_post(); // Assign POST data
$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
{ {
$result=$objcanvas->fetch($id); // Reload object $objcanvas->control->object=$objcanvas->getObject($socid); // Load object
if (empty($objcanvas->control->object))
{
$object = new Contact($db);
$object->fetch($id,$user);
$objcanvas->control->object=$object;
}
$objcanvas->assign_values('view'); // Assign values $objcanvas->assign_values('view'); // Assign values
$objcanvas->display_canvas('view'); // Show template $objcanvas->display_canvas('view'); // Show template
} }
@ -350,7 +360,7 @@ else
{ {
// Si edition contact deja existant // Si edition contact deja existant
$object = new Contact($db); $object = new Contact($db);
$return=$object->fetch(GETPOST("id"), $user); $return=$object->fetch($id, $user);
if ($return <= 0) if ($return <= 0)
{ {
dol_print_error('',$object->error); dol_print_error('',$object->error);

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

@ -160,12 +160,23 @@ class Canvas
} }
/** /**
* Fetch object values * get object
* @param id Element id * @param param1 Param1
* @param param2 Param2
* @param param3 Param3
* @return object Object loaded
*/ */
function fetch($id) function getObject($param1, $param2='', $param2='')
{ {
return $this->control->object->fetch($id); if (is_object($this->control->object) && method_exists($this->control->object,'fetch'))
{
$this->control->object->fetch($param1, $param2, $param3);
return $this->control->object;
}
else
{
return 0;
}
} }
/** /**
@ -194,6 +205,7 @@ class Canvas
*/ */
function assign_post() function assign_post()
{ {
if (empty($_POST)) return;
if (method_exists($this->control,'assign_post')) $this->control->assign_post(); if (method_exists($this->control,'assign_post')) $this->control->assign_post();
} }

24
htdocs/societe/soc.php
View File

@ -398,17 +398,27 @@ if (is_object($objcanvas) && $objcanvas->displayCanvasExists($action))
} }
elseif ($action == 'edit') elseif ($action == 'edit')
{ {
$objcanvas->fetch($socid); // Reload object $objcanvas->control->object=$objcanvas->getObject($socid); // Load object
if (! empty($_POST)) { if (empty($objcanvas->control->object))
$objcanvas->assign_post(); // Assign POST data {
} $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->assign_values($action); // Set value for templates
$objcanvas->display_canvas($action); // Show template $objcanvas->display_canvas($action); // Show template
} }
else else
{ {
$result=$objcanvas->fetch($socid); // Relaod object $objcanvas->control->object=$objcanvas->getObject($socid); // Load object
$objcanvas->assign_values(); // Assign values if (empty($objcanvas->control->object))
{
$object = new Societe($db);
$object->fetch($socid);
$objcanvas->control->object=$object;
}
$objcanvas->assign_values(); // Assign values
$objcanvas->display_canvas(); // Show template $objcanvas->display_canvas(); // Show template
// TODO Move this also into template // TODO Move this also into template
@ -937,7 +947,6 @@ else
if (! $_POST["nom"]) if (! $_POST["nom"])
{ {
$soc = new Societe($db); $soc = new Societe($db);
$soc->id = $socid;
$soc->fetch($socid); $soc->fetch($socid);
} }
else else
@ -1312,7 +1321,6 @@ else
* View * View
*/ */
$soc = new Societe($db); $soc = new Societe($db);
$soc->id = $socid;
$result=$soc->fetch($socid); $result=$soc->fetch($socid);
if ($result < 0) if ($result < 0)
{ {