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

Fix conflict

Browse Source
This commit is contained in:
Jean-François Ferry 2014-03-15 03:22:21 +01:00 committed by jfefe
parent 06f17da1e5
commit 98491ff277
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
element_resource.php
View File

@ -180,15 +180,17 @@ else
//print '/'.$modresources.'/class/'.$resource_obj.'.class.php<br />'; //print '/'.$modresources.'/class/'.$resource_obj.'.class.php<br />';
$path = '';
if(strpos($resource_obj,'@'))
$path .= '/'.$element_prop['module'];
$linked_resources = $object->getElementResources($element,$element_id,$resource_obj); $linked_resources = $object->getElementResources($element,$element_id,$resource_obj);
if ( $mode == 'add' && $resource_obj == $resource_type) if ( $mode == 'add' && $resource_obj == $resource_type)
{ {
//print '/'.$element_prop['module'].'/core/tpl/resource_'.$element_prop['element'].'_'.$mode.'.tpl.php'.'<BR>'; //print '/'.$element_prop['module'].'/core/tpl/resource_'.$element_prop['element'].'_'.$mode.'.tpl.php'.'<BR>';
$path = $element_prop['module'];
if(strpos($element_prop['module'],'@'))
$path .= '/'.$element_prop['module'];
// If we have a specific template we use it // If we have a specific template we use it
if(file_exists(dol_buildpath($path.'/core/tpl/resource_'.$element_prop['element'].'_'.$mode.'.tpl.php'))) if(file_exists(dol_buildpath($path.'/core/tpl/resource_'.$element_prop['element'].'_'.$mode.'.tpl.php')))
@ -207,9 +209,9 @@ else
//print '/'.$element_prop['module'].'/core/tpl/resource_'.$element_prop['element'].'_view.tpl.php'; //print '/'.$element_prop['module'].'/core/tpl/resource_'.$element_prop['element'].'_view.tpl.php';
// If we have a specific template we use it // If we have a specific template we use it
if(file_exists(dol_buildpath('/'.$element_prop['module'].'/core/tpl/resource_'.$element_prop['element'].'_view.tpl.php'))) if(file_exists(dol_buildpath($path.'/core/tpl/resource_'.$element_prop['element'].'_view.tpl.php')))
{ {
$res=@include dol_buildpath('/'.$element_prop['module'].'/core/tpl/resource_'.$element_prop['element'].'_view.tpl.php'); $res=@include dol_buildpath($path.'/core/tpl/resource_'.$element_prop['element'].'_view.tpl.php');
} }
else else