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

Fix ICAL export add a user to all events

Browse Source
This commit is contained in:
Tobias Sekan 2019-11-07 15:45:34 +01:00 committed by GitHub
parent 027d94d41a
commit 3677855ebc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
htdocs/comm/action/class/actioncomm.class.php
View File

@ -824,35 +824,55 @@ class ActionComm extends CommonObject
/** /**
* Initialize this->userassigned array with list of id of user assigned to event * Initialize this->userassigned array with list of id of user assigned to event
* *
* @return int <0 if KO, >0 if OK * @param bool $override this->userownerid when empty
* @return int <0 if KO, >0 if OK
*/ */
public function fetch_userassigned() public function fetch_userassigned($override = true)
{ {
// phpcs:enable // phpcs:enable
$sql ="SELECT fk_actioncomm, element_type, fk_element, answer_status, mandatory, transparency"; $sql ="SELECT fk_actioncomm, element_type, fk_element, answer_status, mandatory, transparency";
$sql.=" FROM ".MAIN_DB_PREFIX."actioncomm_resources"; $sql.=" FROM ".MAIN_DB_PREFIX."actioncomm_resources";
$sql.=" WHERE element_type = 'user' AND fk_actioncomm = ".$this->id; $sql.=" WHERE element_type = 'user' AND fk_actioncomm = ".$this->id;
$resql2=$this->db->query($sql);
if ($resql2)
{
$this->userassigned=array();
// If owner is known, we must but id first into list $resql2=$this->db->query($sql);
if ($this->userownerid > 0) $this->userassigned[$this->userownerid]=array('id'=>$this->userownerid); // Set first so will be first into list. if ($resql2)
{
$this->userassigned = array();
// If owner is known, we must but id first into list
if ($this->userownerid > 0)
{
// Set first so will be first into list.
$this->userassigned[$this->userownerid] = array('id'=>$this->userownerid);
}
while ($obj = $this->db->fetch_object($resql2)) while ($obj = $this->db->fetch_object($resql2))
{ {
if ($obj->fk_element > 0) $this->userassigned[$obj->fk_element]=array('id'=>$obj->fk_element, 'mandatory'=>$obj->mandatory, 'answer_status'=>$obj->answer_status, 'transparency'=>$obj->transparency); if ($obj->fk_element > 0)
if (empty($this->userownerid)) $this->userownerid=$obj->fk_element; // If not defined (should not happened, we fix this) {
$this->userassigned[$obj->fk_element] = array('id'=>$obj->fk_element,
'mandatory'=>$obj->mandatory,
'answer_status'=>$obj->answer_status,
'transparency'=>$obj->transparency);
}
if($override === true)
{
// If not defined (should not happened, we fix this)
if (empty($this->userownerid))
{
$this->userownerid = $obj->fk_element;
}
}
} }
return 1; return 1;
} }
else else
{ {
dol_print_error($this->db); dol_print_error($this->db);
return -1; return -1;
} }
} }
/** /**
@ -1676,7 +1696,7 @@ class ActionComm extends CommonObject
// TODO: find a way to call "$this->fetch_userassigned();" without override "$this" properties // TODO: find a way to call "$this->fetch_userassigned();" without override "$this" properties
$this->id = $obj->id; $this->id = $obj->id;
$this->fetch_userassigned(); $this->fetch_userassigned(false);
$assignedUserArray = array(); $assignedUserArray = array();