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

Merge pull request #11939 from frederic34/patch-17

Browse Source 
fix badge linked resources on fichinter
This commit is contained in:
Laurent Destailleur 2019-09-27 11:32:27 +02:00 committed by GitHub
commit e03667dc75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
htdocs/core/lib/fichinter.lib.php
View File

@ -66,19 +66,20 @@ function fichinter_prepare_head($object)
if ($conf->resource->enabled)
{
require_once DOL_DOCUMENT_ROOT.'/resource/class/dolresource.class.php';
$nbResource = 0;
$objectres=new Dolresource($db);
if (is_array($objectres->available_resources))
{
foreach ($objectres->available_resources as $modresources => $resources)
{
$resources=(array) $resources; // To be sure $resources is an array
foreach($resources as $resource_obj)
{
$linked_resources = $object->getElementResources('fichinter', $object->id, $resource_obj);
}
}
}
$objectres = new Dolresource($db);
$linked_resources = $objectres->getElementResources('fichinter', $object->id);
$nbResource = (is_array($linked_resources)?count($linked_resources):0);
// if (is_array($objectres->available_resources))
// {
// foreach ($objectres->available_resources as $modresources => $resources)
// {
// $resources=(array) $resources; // To be sure $resources is an array
// foreach($resources as $resource_obj)
// {
// $linked_resources = $object->getElementResources('fichinter', $object->id, $resource_obj);
// }
// }
// }
$head[$h][0] = DOL_URL_ROOT.'/resource/element_resource.php?element=fichinter&element_id='.$object->id;
$head[$h][1] = $langs->trans("Resources");