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

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0

Browse Source
This commit is contained in:
Laurent Destailleur 2017-08-11 19:58:09 +02:00
commit 9d4d85ca9d
2 changed files with 67 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/resource/add.php
View File

@ -66,8 +66,16 @@ $extrafields = new ExtraFields($db);
// fetch optionals attributes and labels // fetch optionals attributes and labels
$extralabels=$extrafields->fetch_name_optionals_label($object->table_element); $extralabels=$extrafields->fetch_name_optionals_label($object->table_element);
if ($action == 'confirm_add_resource') $hookmanager->initHooks(array('resource_card_add','globalcard'));
$parameters=array();
$reshook=$hookmanager->executeHooks('doActions',$parameters,$object,$action); // Note that $action and $object may have been modified by some hooks
if ($reshook < 0) setEventMessages($hookmanager->error, $hookmanager->errors, 'errors');
if (empty($reshook))
{ {
if ($action == 'confirm_add_resource')
{
if (! $cancel) if (! $cancel)
{ {
$error=''; $error='';
@ -121,9 +129,9 @@ if ($action == 'confirm_add_resource')
{ {
Header("Location: list.php"); Header("Location: list.php");
} }
}
} }
/* /*
* View * View
*/ */

7
htdocs/resource/card.php
View File

@ -54,10 +54,13 @@ if ($user->societe_id > 0)
accessforbidden(); accessforbidden();
} }
if( ! $user->rights->resource->read) if (! $user->rights->resource->read)
accessforbidden(); accessforbidden();
$object = new Dolresource($db); $object = new Dolresource($db);
$objectFetchRes = $object->fetch($id);
if (! ($objectFetchRes > 0)) dol_print_error($db, $object->error);
$extrafields = new ExtraFields($db); $extrafields = new ExtraFields($db);
@ -162,7 +165,7 @@ llxHeader('',$pagetitle,'');
$form = new Form($db); $form = new Form($db);
$formresource = new FormResource($db); $formresource = new FormResource($db);
if ( $object->fetch($id) > 0 ) if ( $objectFetchRes > 0 )
{ {
$head=resource_prepare_head($object); $head=resource_prepare_head($object);