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

Fix private message type

Browse Source
This commit is contained in:
John Botella 2019-09-12 18:39:29 +02:00
parent b2187c829a
commit 7dcb871048
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/lib/ticket.lib.php
View File

@ -658,10 +658,12 @@ function show_ticket_messaging($conf, $langs, $db, $filterobj, $objcon = '', $no
$out .= ' <span class="messaging-title">';
if($actionstatic->code == 'TICKET_MSG') {
$out .= $langs->trans('TicketNewMessage');
}else{
if($actionstatic->code == 'TICKET_MSG') {
$out .= $langs->trans('TicketNewMessage');
}
elseif($actionstatic->code == 'TICKET_MSG_PRIVATE') {
$out .= $langs->trans('TicketNewMessage').' <em>('.$langs->trans('Private').')</em>';
}else{
if (isset($histo[$key]['type']) && $histo[$key]['type'] == 'action') {
$transcode = $langs->trans("Action" . $histo[$key]['acode']);
$libelle = ($transcode != "Action" . $histo[$key]['acode'] ? $transcode : $histo[$key]['alabel']);

7
htdocs/theme/eldy/timeline.inc.php
View File

@ -59,6 +59,11 @@ if (! defined('ISLOADEDBYSTEELSHEET')) die('Must be call by steelsheet'); ?>
padding: 0;
position: relative;
}
.timeline > li.timeline-code-ticket_msg_private > .timeline-item {
background: #fffbe5;
}
.timeline > li > .timeline-item > .time{
color: #6f6f6f;
float: right;
@ -183,4 +188,4 @@ a.timeline-btn:hover
.timeline-badge-date{
background-color: #0073b7 !important;
color: #fff !important;
}
}

3
htdocs/ticket/class/ticket.class.php
View File

@ -1631,6 +1631,9 @@ class Ticket extends CommonObject
$actioncomm=new ActionComm($this->db);
$actioncomm->type_code = 'AC_OTH_AUTO';
$actioncomm->code = 'TICKET_MSG';
if($this->private){
$actioncomm->code = 'TICKET_MSG_PRIVATE';
}
$actioncomm->socid = $this->socid;
$actioncomm->label = $this->subject;
$actioncomm->note_private = $this->message;