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

Merge pull request #9966 from madx666/contrib

Browse Source 
Fix public ticket website
This commit is contained in:
Laurent Destailleur 2018-11-08 19:54:36 +01:00 committed by GitHub
commit 7430a35533
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/ticket/class/actions_ticket.class.php
View File

@ -827,6 +827,7 @@ class ActionsTicket
global $mysoc, $conf, $langs; global $mysoc, $conf, $langs;
$object = new Ticket($this->db);
$error = 0; $error = 0;
$ret = $object->fetch('', '', GETPOST('track_id','alpha')); $ret = $object->fetch('', '', GETPOST('track_id','alpha'));
$object->socid = $object->fk_soc; $object->socid = $object->fk_soc;
@ -1203,15 +1204,14 @@ class ActionsTicket
public function viewTicketMessages($show_private, $show_user = true) public function viewTicketMessages($show_private, $show_user = true)
{ {
global $conf, $langs, $user; global $conf, $langs, $user;
global $object;
// Load logs in cache // Load logs in cache
$ret = $object->loadCacheMsgsTicket(); $ret = $this->dao->loadCacheMsgsTicket();
$action = GETPOST('action'); $action = GETPOST('action');
$this->viewTicketOriginalMessage($user, $action); $this->viewTicketOriginalMessage($user, $action);
if (is_array($object->cache_msgs_ticket) && count($object->cache_msgs_ticket) > 0) { if (is_array($this->dao->cache_msgs_ticket) && count($this->dao->cache_msgs_ticket) > 0) {
print_titre($langs->trans('TicketMailExchanges')); print_titre($langs->trans('TicketMailExchanges'));
print '<table class="border" style="width:100%;">'; print '<table class="border" style="width:100%;">';
@ -1228,7 +1228,7 @@ class ActionsTicket
print '</td>'; print '</td>';
} }
foreach ($object->cache_msgs_ticket as $id => $arraymsgs) { foreach ($this->dao->cache_msgs_ticket as $id => $arraymsgs) {
if (!$arraymsgs['private'] if (!$arraymsgs['private']
|| ($arraymsgs['private'] == "1" && $show_private) || ($arraymsgs['private'] == "1" && $show_private)
) { ) {