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

Fix list of resource not visible

Browse Source
This commit is contained in:
Laurent Destailleur 2015-08-14 17:35:05 +02:00
parent 84d4cbdbcc
commit 2abb90713e
4 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/core/class/commonobject.class.php
View File

@ -3277,12 +3277,12 @@ abstract class CommonObject
* Need $this->element & $this->id * Need $this->element & $this->id
* *
* @param int $resource_id Resource id * @param int $resource_id Resource id
* @param string $resource_element Resource element * @param string $resource_type 'resource'
* @param int $busy Busy or not * @param int $busy Busy or not
* @param int $mandatory Mandatory or not * @param int $mandatory Mandatory or not
* @return int <=0 if KO, >0 if OK * @return int <=0 if KO, >0 if OK
*/ */
function add_element_resource($resource_id,$resource_element,$busy=0,$mandatory=0) function add_element_resource($resource_id, $resource_type, $busy=0, $mandatory=0)
{ {
$this->db->begin(); $this->db->begin();
@ -3295,7 +3295,7 @@ abstract class CommonObject
$sql.= ", mandatory"; $sql.= ", mandatory";
$sql.= ") VALUES ("; $sql.= ") VALUES (";
$sql.= $resource_id; $sql.= $resource_id;
$sql.= ", '".$resource_element."'"; $sql.= ", '".$resource_type."'";
$sql.= ", '".$this->id."'"; $sql.= ", '".$this->id."'";
$sql.= ", '".$this->element."'"; $sql.= ", '".$this->element."'";
$sql.= ", '".$busy."'"; $sql.= ", '".$busy."'";

20
htdocs/core/lib/functions2.lib.php
View File

@ -1791,10 +1791,10 @@ function cleanCorruptedTree($db, $tabletocleantree, $fieldfkparent)
/** /**
* Get an array with properties of an element * Get an array with properties of an element
* *
* @param string $element_type Element type. ex : project_task or object@modulext or object_under@module * @param string $element_type Element type: 'action', 'facture', 'project_task' or 'object@modulext'...
* @return array (module, classpath, element, subelement, classfile, classname) * @return array (module, classpath, element, subelement, classfile, classname)
*/ */
function getElementProperties($element_type) function getElementProperties($element_type)
{ {
// Parse element/subelement (ex: project_task) // Parse element/subelement (ex: project_task)
@ -1887,15 +1887,15 @@ function getElementProperties($element_type)
} }
/** /**
* Fetch an object with element_type and its id * Fetch an object from its id and element_type
* Inclusion classes is automatic * Inclusion classes is automatic
* *
* @param int $element_id Element id * @param int $element_id Element id
* @param string $element_type Element type * @param string $element_type Element type
* @return object || 0 || -1 if error * @return int|object object || 0 || -1 if error
*/ */
function fetchObjectByElement($element_id,$element_type) { function fetchObjectByElement($element_id, $element_type)
{
global $conf; global $conf;
global $db,$conf; global $db,$conf;

4
htdocs/core/tpl/resource_add.tpl.php
View File

@ -14,7 +14,7 @@ $out .= '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
$out .= '<input type="hidden" name="action" value="add_element_resource">'; $out .= '<input type="hidden" name="action" value="add_element_resource">';
$out .= '<input type="hidden" name="element" value="'.$element.'">'; $out .= '<input type="hidden" name="element" value="'.$element.'">';
$out .= '<input type="hidden" name="element_id" value="'.$element_id.'">'; $out .= '<input type="hidden" name="element_id" value="'.$element_id.'">';
$out .= '<input type="hidden" name="resource_type" value="'.$resource_type.'">'; $out .= '<input type="hidden" name="resource_type" value="'.($resource_type?$resource_type:'resource').'">';
// Place // Place
@ -37,4 +37,4 @@ $out .= '<br />';
print $out; print $out;
// FIN DU TPL // END BEGIN TPL RESOURCE_ADD.TPL.PHP

11
htdocs/resource/element_resource.php
View File

@ -63,23 +63,23 @@ $id = GETPOST('id','int');
$action = GETPOST('action','alpha'); $action = GETPOST('action','alpha');
$mode = GETPOST('mode','alpha'); $mode = GETPOST('mode','alpha');
$lineid = GETPOST('lineid','int'); $lineid = GETPOST('lineid','int');
$element = GETPOST('element','alpha'); $element = GETPOST('element','alpha'); // element_type
$element_id = GETPOST('element_id','int'); $element_id = GETPOST('element_id','int');
$resource_id = GETPOST('fk_resource','int'); $resource_id = GETPOST('fk_resource','int');
$resource_type = GETPOST('resource_type','alpha'); $resource_type = GETPOST('resource_type','alpha');
$busy = GETPOST('busy','int'); $busy = GETPOST('busy','int');
$mandatory = GETPOST('mandatory','int'); $mandatory = GETPOST('mandatory','int');
$cancel = GETPOST('cancel','alpha'); $cancel = GETPOST('cancel','alpha');
$confirm = GETPOST('confirm','alpha'); $confirm = GETPOST('confirm','alpha');
/* /*
* Actions * Actions
*/ */
if($action == 'add_element_resource' && ! $cancel) if ($action == 'add_element_resource' && ! $cancel)
{ {
$objstat = fetchObjectByElement($element_id,$element); $objstat = fetchObjectByElement($element_id, $element);
$res = $objstat->add_element_resource($resource_id,$resource_type,$busy,$mandatory); $res = $objstat->add_element_resource($resource_id,$resource_type,$busy,$mandatory);
if($res > 0) if($res > 0)
{ {
@ -261,9 +261,6 @@ else
{ {
$element_prop = getElementProperties($resource_obj); $element_prop = getElementProperties($resource_obj);
//print '/'.$modresources.'/class/'.$resource_obj.'.class.php<br />'; //print '/'.$modresources.'/class/'.$resource_obj.'.class.php<br />';
$path = ''; $path = '';