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

Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0

Browse Source
This commit is contained in:
Laurent Destailleur 2018-12-10 00:15:54 +01:00
commit bbcb2aa983
1 changed files with 26 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -901,11 +901,6 @@ class Ticket extends CommonObject
if ($res < 0) $error++; if ($res < 0) $error++;
} }
if (!$error) {
$sql = "DELETE FROM " . MAIN_DB_PREFIX . "ticket_logs";
$sql .= " WHERE fk_track_id = '" . $this->db->escape($this->track_id) . "'";
$resql = $this->db->query($sql);
}
if (!$error) { if (!$error) {
$sql = "DELETE FROM " . MAIN_DB_PREFIX . "ticket_msg"; $sql = "DELETE FROM " . MAIN_DB_PREFIX . "ticket_msg";
$sql .= " WHERE fk_track_id = '" . $this->db->escape($this->track_id) . "'"; $sql .= " WHERE fk_track_id = '" . $this->db->escape($this->track_id) . "'";
@ -1495,15 +1490,17 @@ class Ticket extends CommonObject
* 1- create entry into database for message storage * 1- create entry into database for message storage
* 2- if trigger, send an email to ticket contacts * 2- if trigger, send an email to ticket contacts
* *
* @param User $user User that create * @param User $user User that create
* @param string $message Log message * @param string $message Log message
* @param int $noemail 0=send email after, 1=disable emails * @param int $noemail 0=send email after, 1=disable emails
* @return int <0 if KO, >0 if OK * @return int <0 if KO, >0 if OK
*/ */
public function createTicketLog(User $user, $message, $noemail = 0) public function createTicketLog(User $user, $message, $noemail = 0)
{ {
global $conf, $langs; global $conf, $langs;
$error = 0;
$this->db->begin(); $this->db->begin();
// Clean parameters // Clean parameters
@ -1515,37 +1512,23 @@ class Ticket extends CommonObject
return -1; return -1;
} }
// Insert request // TODO Should call the trigger TICKET_MODIFY with $this->context with all data to record event
$sql = "INSERT INTO " . MAIN_DB_PREFIX . "ticket_logs("; // so the event is stored by the agenda/event trigger
$sql .= "entity,";
$sql .= "datec,";
$sql .= "fk_track_id,";
$sql .= "fk_user_create,";
$sql .= "message";
$sql .= ") VALUES (";
$sql .= " " . $conf->entity . ",";
$sql .= " '" . $this->db->idate(dol_now()) . "',";
$sql .= " '" . $this->db->escape($this->track_id) . "',";
$sql .= " " . ($user->id > 0 ? $user->id : 'NULL') . ",";
$sql .= " '" . $this->db->escape($message) . "'";
$sql .= ")";
dol_syslog(get_class($this) . "::create_ticket_log sql=" . $sql, LOG_DEBUG); if (!$error) {
$resql = $this->db->query($sql); $this->db->commit();
if ($resql) {
if ($conf->global->TICKET_ACTIVATE_LOG_BY_EMAIL && !$noemail) {
$this->sendLogByEmail($user, $message);
}
if (!$error) { if ($conf->global->TICKET_ACTIVATE_LOG_BY_EMAIL && !$noemail) {
$this->db->commit(); $this->sendLogByEmail($user, $message);
return 1; }
}
} else { return 1;
$this->db->rollback(); }
$this->error = "Error " . $this->db->lasterror(); else
dol_syslog(get_class($this) . "::create_ticket_log " . $this->error, LOG_ERR); {
return -1; $this->db->rollback();
return -1;
} }
} }
@ -1655,6 +1638,8 @@ class Ticket extends CommonObject
} }
// Cache deja charge // Cache deja charge
// TODO Read the table llx_actioncomm
/*
$sql = "SELECT rowid, fk_user_create, datec, message"; $sql = "SELECT rowid, fk_user_create, datec, message";
$sql .= " FROM " . MAIN_DB_PREFIX . "ticket_logs"; $sql .= " FROM " . MAIN_DB_PREFIX . "ticket_logs";
$sql .= " WHERE fk_track_id ='" . $this->db->escape($this->track_id) . "'"; $sql .= " WHERE fk_track_id ='" . $this->db->escape($this->track_id) . "'";
@ -1677,7 +1662,9 @@ class Ticket extends CommonObject
$this->error = "Error " . $this->db->lasterror(); $this->error = "Error " . $this->db->lasterror();
dol_syslog(get_class($this) . "::loadCacheLogsTicket " . $this->error, LOG_ERR); dol_syslog(get_class($this) . "::loadCacheLogsTicket " . $this->error, LOG_ERR);
return -1; return -1;
} }*/
return 0;
} }
/** /**