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

108
htdocs/resource/add.php
View File

@ -66,64 +66,72 @@ $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 (! $cancel)
{
$error='';
$ref=GETPOST('ref','alpha'); if ($action == 'confirm_add_resource')
$description=GETPOST('description','alpha'); {
$fk_code_type_resource=GETPOST('fk_code_type_resource','alpha'); if (! $cancel)
{
$error='';
if (empty($ref)) $ref=GETPOST('ref','alpha');
{ $description=GETPOST('description','alpha');
$mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Ref")); $fk_code_type_resource=GETPOST('fk_code_type_resource','alpha');
setEventMessages($mesg, null, 'errors');
$error++;
}
if (! $error) if (empty($ref))
{ {
$object=new Dolresource($db); $mesg=$langs->trans("ErrorFieldRequired",$langs->transnoentities("Ref"));
$object->ref=$ref; setEventMessages($mesg, null, 'errors');
$object->description=$description; $error++;
$object->fk_code_type_resource=$fk_code_type_resource; }
// Fill array 'array_options' with data from add form if (! $error)
$ret = $extrafields->setOptionalsFromPost($extralabels, $object); {
if ($ret < 0) { $object=new Dolresource($db);
$error ++; $object->ref=$ref;
} $object->description=$description;
$object->fk_code_type_resource=$fk_code_type_resource;
$result=$object->create($user); // Fill array 'array_options' with data from add form
if ($result > 0) $ret = $extrafields->setOptionalsFromPost($extralabels, $object);
{ if ($ret < 0) {
// Creation OK $error ++;
$db->commit(); }
setEventMessages($langs->trans('ResourceCreatedWithSuccess'), null, 'mesgs');
Header("Location: card.php?id=" . $object->id); $result=$object->create($user);
return; if ($result > 0)
} {
else // Creation OK
{ $db->commit();
// Creation KO setEventMessages($langs->trans('ResourceCreatedWithSuccess'), null, 'mesgs');
setEventMessages($object->error, $object->errors, 'errors'); Header("Location: card.php?id=" . $object->id);
$action = ''; return;
} }
} else
else {
{ // Creation KO
$action = ''; setEventMessages($object->error, $object->errors, 'errors');
} $action = '';
} }
else }
{ else
Header("Location: list.php"); {
} $action = '';
}
}
else
{
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);