Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-16 14:31:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Modules into core should never, by definition, activate hooks

Browse Source 
(hooks are architecture solution for external module)
This commit is contained in:
Laurent Destailleur
2014-05-14 12:14:18 +02:00
parent ce82216879
commit 0027dc30f5
2 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/modules/modResource.class.php
View File

@@ -94,7 +94,7 @@ class modResource extends DolibarrModules
// Set this to relative path of css if module has its own css file // Set this to relative path of css if module has its own css file
//'css' => '/resource/css/resource.css.php', //'css' => '/resource/css/resource.css.php',
// Set here all hooks context managed by module // Set here all hooks context managed by module
'hooks' => array('actioncard','actioncommdao','resource_card','element_resource') // 'hooks' => array('actioncard','actioncommdao','resource_card','element_resource')
// Set here all workflow context managed by module // Set here all workflow context managed by module
//'workflow' => array('order' => array('WORKFLOW_ORDER_AUTOCREATE_INVOICE')) //'workflow' => array('order' => array('WORKFLOW_ORDER_AUTOCREATE_INVOICE'))
); );
@@ -190,7 +190,7 @@ class modResource extends DolibarrModules
$this->rights[$r][3] = 0; $this->rights[$r][3] = 0;
$this->rights[$r][4] = 'delete'; $this->rights[$r][4] = 'delete';
$r++; $r++;
$this->rights[$r][0] = 1101204; $this->rights[$r][0] = 1101204;
$this->rights[$r][1] = 'Link resources'; $this->rights[$r][1] = 'Link resources';
$this->rights[$r][3] = 0; $this->rights[$r][3] = 0;
@@ -225,7 +225,7 @@ class modResource extends DolibarrModules
'titre'=> 'MenuResourceIndex', 'titre'=> 'MenuResourceIndex',
'mainmenu'=>'tools', 'mainmenu'=>'tools',
'leftmenu'=> 'resource', 'leftmenu'=> 'resource',
'url'=> '/resource/list.php', 'url'=> '/resource/list.php',
'langs'=> 'resource', 'langs'=> 'resource',
'position'=> 100, 'position'=> 100,
'enabled'=> '1', 'enabled'=> '1',
@@ -233,7 +233,7 @@ class modResource extends DolibarrModules
'user'=> 0 'user'=> 0
); );
$r++; $r++;
$this->menu[$r++]=array( $this->menu[$r++]=array(
'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=resource', //On utilise les ancres définis dans le menu parent déclaré au dessus 'fk_menu'=>'fk_mainmenu=tools,fk_leftmenu=resource', //On utilise les ancres définis dans le menu parent déclaré au dessus
'type'=> 'left', // Toujours un menu gauche 'type'=> 'left', // Toujours un menu gauche

27
htdocs/resource/class/actions_resource.class.php
View File

@@ -23,6 +23,7 @@
/** /**
* Actions class file for resources * Actions class file for resources
* *
* TODO Remove this class and replace a method into commonobject
*/ */
class ActionsResource class ActionsResource
{ {
@@ -44,10 +45,12 @@ class ActionsResource
/** /**
* doActions for resource module * doActions for resource module
* *
* @param array $parameters parameters * @param array $parameters parameters
* @param Object $object object * @param Object &$object object
* @param string $action action * @param string &$action action
* @return void
*/ */
/* Why a hook action ? TODO Remove this class and replace a method into commonobject
function doActions($parameters, &$object, &$action) function doActions($parameters, &$object, &$action)
{ {
global $langs,$user; global $langs,$user;
@@ -60,9 +63,9 @@ class ActionsResource
$res = $object->fetch(GETPOST('id')); $res = $object->fetch(GETPOST('id'));
if($res) if($res)
{ {
$result = $object->delete(GETPOST('id')); $result = $object->delete(GETPOST('id'));
if ($result >= 0) if ($result >= 0)
{ {
setEventMessage($langs->trans('RessourceSuccessfullyDeleted')); setEventMessage($langs->trans('RessourceSuccessfullyDeleted'));
@@ -117,8 +120,8 @@ class ActionsResource
{ {
$res = $object->fetch(GETPOST('id')); $res = $object->fetch(GETPOST('id'));
if($res) if($res)
{ {
$result = $object->delete_resource(GETPOST('lineid'),GETPOST('element')); $result = $object->delete_resource(GETPOST('lineid'),GETPOST('element'));
if ($result >= 0) if ($result >= 0)
@@ -131,7 +134,7 @@ class ActionsResource
setEventMessage($object->error,'errors'); setEventMessage($object->error,'errors');
} }
} }
else else
{ {
setEventMessage($object->error,'errors'); setEventMessage($object->error,'errors');
} }
@@ -143,10 +146,10 @@ class ActionsResource
$res = $object->fetch_element_resource(GETPOST('lineid')); $res = $object->fetch_element_resource(GETPOST('lineid'));
if($res) if($res)
{ {
$object->busy = GETPOST('busy'); $object->busy = GETPOST('busy');
$object->mandatory = GETPOST('mandatory'); $object->mandatory = GETPOST('mandatory');
$result = $object->update_element_resource($user); $result = $object->update_element_resource($user);
if ($result >= 0) if ($result >= 0)
@@ -160,8 +163,6 @@ class ActionsResource
} }
} }
} }
} }
}*/
}
} }