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

Fix author in message / ticket API

Browse Source
This commit is contained in:
ptibogxiv 2019-08-02 11:41:40 +02:00 committed by GitHub
parent 808d6ba389
commit 7a2e08a681
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
htdocs/ticket/class/api_tickets.class.php
View File

@ -160,15 +160,15 @@ class Tickets extends DolibarrApi
$num = count($this->ticket->cache_msgs_ticket); $num = count($this->ticket->cache_msgs_ticket);
$i = 0; $i = 0;
while ($i < $num) { while ($i < $num) {
if ($this->ticket->cache_msgs_ticket[$i]['fk_user_action'] > 0) { if ($this->ticket->cache_msgs_ticket[$i]['fk_user_author'] > 0) {
$user_action = new User($this->db); $user_action = new User($this->db);
$user_action->fetch($this->ticket->cache_msgs_ticket[$i]['fk_user_action']); $user_action->fetch($this->ticket->cache_msgs_ticket[$i]['fk_user_author']);
} }
// Now define messages // Now define messages
$messages[] = array( $messages[] = array(
'id' => $this->ticket->cache_msgs_ticket[$i]['id'], 'id' => $this->ticket->cache_msgs_ticket[$i]['id'],
'fk_user_action' => $this->ticket->cache_msgs_ticket[$i]['fk_user_action'], 'fk_user_action' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'],
'fk_user_action_socid' => $user_action->socid, 'fk_user_action_socid' => $user_action->socid,
'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname), 'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname),
'message' => $this->ticket->cache_msgs_ticket[$i]['message'], 'message' => $this->ticket->cache_msgs_ticket[$i]['message'],
@ -195,6 +195,7 @@ class Tickets extends DolibarrApi
// Now define messages // Now define messages
$history[] = array( $history[] = array(
'id' => $this->ticket->cache_logs_ticket[$i]['id'], 'id' => $this->ticket->cache_logs_ticket[$i]['id'],
'fk_user_author' => $this->ticket->cache_msgs_ticket[$i]['fk_user_author'],
'fk_user_action' => $this->ticket->cache_logs_ticket[$i]['fk_user_create'], 'fk_user_action' => $this->ticket->cache_logs_ticket[$i]['fk_user_create'],
'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname), 'fk_user_action_string' => dolGetFirstLastname($user_action->firstname, $user_action->lastname),
'message' => $this->ticket->cache_logs_ticket[$i]['message'], 'message' => $this->ticket->cache_logs_ticket[$i]['message'],