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

Yeah ! Hooks can now create, update, do nothing, replace or complete, warn validity check of parameters, add confirmation, etc.

Browse Source
This commit is contained in:
Laurent Destailleur 2011-07-02 14:35:22 +00:00
parent 249a8a9091
commit 2268de9898
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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.218 2011/07/02 13:09:52 eldy Exp $ * \version $Id: fiche.php,v 1.219 2011/07/02 14:35:22 eldy Exp $
*/ */
require("../main.inc.php"); require("../main.inc.php");
@ -81,7 +81,7 @@ if (is_array($conf->hooks_modules) && !empty($conf->hooks_modules))
$reshook=0; $reshook=0;
// Hook of actions. After that reshook is 0 if we need to process standard actions, >0 otherwise. // Hook of actions. After that, reshook is 0 if we need to process standard actions, >0 otherwise.
if (! empty($object->hooks)) if (! empty($object->hooks))
{ {
foreach($object->hooks as $hook) foreach($object->hooks as $hook)
@ -92,7 +92,7 @@ if (! empty($object->hooks))
{ {
if (method_exists($module,'doActions')) if (method_exists($module,'doActions'))
{ {
$resaction+=$module->doActions($object,$action); $resaction+=$module->doActions($object,$action,$id); // object is deprecated, action can be changed by method (to go back to other action for example), id can be changed/set by method (during creation for example)
if ($resaction < 0 || ! empty($module->error) || (! empty($module->errors) && sizeof($module->errors) > 0)) if ($resaction < 0 || ! empty($module->error) || (! empty($module->errors) && sizeof($module->errors) > 0))
{ {
$error=$module->error; $errors=$module->errors; $error=$module->error; $errors=$module->errors;
@ -974,5 +974,5 @@ else
$db->close(); $db->close();
llxFooter('$Date: 2011/07/02 13:09:52 $ - $Revision: 1.218 $'); llxFooter('$Date: 2011/07/02 14:35:22 $ - $Revision: 1.219 $');
?> ?>

13
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.118 2011/07/02 14:12:44 eldy Exp $ * \version $Id: soc.php,v 1.119 2011/07/02 14:35:22 eldy Exp $
*/ */
require("../main.inc.php"); require("../main.inc.php");
@ -90,7 +90,7 @@ if (is_array($conf->hooks_modules) && !empty($conf->hooks_modules))
$reshook=0; $reshook=0;
// Hook of actions. After that reshook is 0 if we need to process standard actions, >0 otherwise. // Hook of actions. After that, reshook is 0 if we need to process standard actions, >0 otherwise.
if (! empty($object->hooks)) if (! empty($object->hooks))
{ {
foreach($object->hooks as $hook) foreach($object->hooks as $hook)
@ -101,16 +101,15 @@ if (! empty($object->hooks))
{ {
if (method_exists($module,'doActions')) if (method_exists($module,'doActions'))
{ {
$resaction+=$module->doActions($object,$action); $resaction+=$module->doActions($object,$action,$socid); // object is deprecated, action can be changed by method (to go back to other action for example), socid can be changed/set by method (during creation for example)
if ($resaction < 0 || ! empty($module->error) || (! empty($module->errors) && sizeof($module->errors) > 0)) if ($resaction < 0 || ! empty($module->error) || (! empty($module->errors) && sizeof($module->errors) > 0))
{ {
$error=$module->error; $errors=$module->errors; $error=$module->error; $errors=$module->errors;
if ($action=='add') $action='create'; if ($action=='add') $action='create'; // TODO this chnage must be inside the doActions
if ($action=='update') $action='edit'; if ($action=='update') $action='edit'; // TODO this chnage must be inside the doActions
} }
else else
{ {
if ($action=='add')
$reshook+=$resaction; $reshook+=$resaction;
} }
} }
@ -1973,5 +1972,5 @@ else
$db->close(); $db->close();
llxFooter('$Date: 2011/07/02 14:12:44 $ - $Revision: 1.118 $'); llxFooter('$Date: 2011/07/02 14:35:22 $ - $Revision: 1.119 $');
?> ?>