Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 17:48:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

FIX missing entity filters + wrong widget name (#35873)

Browse Source
This commit is contained in:
Regis Houssin
2025-10-22 00:56:57 +02:00
committed by GitHub
parent 111dcd174f
commit c04359f995
5 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/admin/boxes.php
View File

@@ -238,7 +238,7 @@ $sql .= " bd.rowid as boxid";
$sql .= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as bd"; $sql .= " FROM ".MAIN_DB_PREFIX."boxes as b, ".MAIN_DB_PREFIX."boxes_def as bd";
$sql .= " WHERE b.box_id = bd.rowid"; $sql .= " WHERE b.box_id = bd.rowid";
$sql .= " AND b.entity IN (0,".$conf->entity.")"; $sql .= " AND b.entity IN (0,".$conf->entity.")";
$sql .= " AND b.fk_user=0"; $sql .= " AND b.fk_user = 0";
$sql .= " ORDER by b.position, b.box_order"; $sql .= " ORDER by b.position, b.box_order";
//print $sql; //print $sql;

3
htdocs/core/boxes/box_graph_nb_ticket_last_x_days.php
View File

@@ -109,7 +109,8 @@ class box_graph_nb_ticket_last_x_days extends ModeleBoxes
if ($user->hasRight('ticket', 'read')) { if ($user->hasRight('ticket', 'read')) {
$sql = "SELECT CAST(t.datec AS DATE) as datec, COUNT(t.datec) as nb"; $sql = "SELECT CAST(t.datec AS DATE) as datec, COUNT(t.datec) as nb";
$sql .= " FROM ".MAIN_DB_PREFIX."ticket as t"; $sql .= " FROM ".MAIN_DB_PREFIX."ticket as t";
$sql .= " WHERE CAST(t.datec AS DATE) > '".$this->db->idate($minimumdatec)."'"; $sql .= " WHERE t.entity IN (".getEntity('ticket').")";
$sql .= " AND CAST(t.datec AS DATE) > '".$this->db->idate($minimumdatec)."'";
$sql .= " GROUP BY CAST(t.datec AS DATE)"; $sql .= " GROUP BY CAST(t.datec AS DATE)";
$resql = $this->db->query($sql); $resql = $this->db->query($sql);

6
htdocs/core/boxes/box_graph_nb_tickets_type.php
View File

@@ -84,7 +84,8 @@ class box_graph_nb_tickets_type extends ModeleBoxes
if ($user->hasRight('ticket', 'read')) { if ($user->hasRight('ticket', 'read')) {
$sql = "SELECT ctt.rowid, ctt.label, ctt.code"; $sql = "SELECT ctt.rowid, ctt.label, ctt.code";
$sql .= " FROM " . MAIN_DB_PREFIX . "c_ticket_type as ctt"; $sql .= " FROM " . MAIN_DB_PREFIX . "c_ticket_type as ctt";
$sql .= " WHERE ctt.active = 1"; $sql .= " WHERE ctt.entity IN (".getEntity('c_ticket_type').")";
$sql .= " AND ctt.active = 1";
$sql .= $this->db->order('ctt.rowid', 'ASC'); $sql .= $this->db->order('ctt.rowid', 'ASC');
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
@@ -116,7 +117,8 @@ class box_graph_nb_tickets_type extends ModeleBoxes
$data = array(); $data = array();
$sql = "SELECT t.type_code, COUNT(t.type_code) as nb"; $sql = "SELECT t.type_code, COUNT(t.type_code) as nb";
$sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t"; $sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
$sql .= " WHERE t.fk_statut <> 8"; $sql .= " WHERE t.entity IN (".getEntity('ticket').")";
$sql .= " AND t.fk_statut <> 8";
$sql .= " GROUP BY t.type_code"; $sql .= " GROUP BY t.type_code";
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {

8
htdocs/core/boxes/box_graph_ticket_by_severity.php
View File

@@ -31,7 +31,7 @@ require_once DOL_DOCUMENT_ROOT."/core/boxes/modules_boxes.php";
*/ */
class box_graph_ticket_by_severity extends ModeleBoxes class box_graph_ticket_by_severity extends ModeleBoxes
{ {
public $boxcode = "box_ticket_by_severity"; public $boxcode = "box_graph_ticket_by_severity";
public $boximg = "ticket"; public $boximg = "ticket";
/** /**
* @var string * @var string
@@ -96,7 +96,8 @@ class box_graph_ticket_by_severity extends ModeleBoxes
if ($user->hasRight('ticket', 'read')) { if ($user->hasRight('ticket', 'read')) {
$sql = "SELECT cts.rowid, cts.label, cts.code"; $sql = "SELECT cts.rowid, cts.label, cts.code";
$sql .= " FROM " . MAIN_DB_PREFIX . "c_ticket_severity as cts"; $sql .= " FROM " . MAIN_DB_PREFIX . "c_ticket_severity as cts";
$sql .= " WHERE cts.active = 1"; $sql .= " WHERE cts.entity IN (".getEntity('c_ticket_severity').")";
$sql .= " AND cts.active = 1";
$sql .= $this->db->order('cts.rowid', 'ASC'); $sql .= $this->db->order('cts.rowid', 'ASC');
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
@@ -133,7 +134,8 @@ class box_graph_ticket_by_severity extends ModeleBoxes
$data = array(); $data = array();
$sql = "SELECT t.severity_code, COUNT(t.severity_code) as nb"; $sql = "SELECT t.severity_code, COUNT(t.severity_code) as nb";
$sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t"; $sql .= " FROM " . MAIN_DB_PREFIX . "ticket as t";
$sql .= " WHERE t.fk_statut <> 8"; $sql .= " WHERE t.entity IN (".getEntity('ticket').")";
$sql .= " AND t.fk_statut <> 8";
$sql .= " GROUP BY t.severity_code"; $sql .= " GROUP BY t.severity_code";
$resql = $this->db->query($sql); $resql = $this->db->query($sql);
if ($resql) { if ($resql) {

2
htdocs/core/modules/modTicket.class.php
View File

@@ -211,7 +211,7 @@ class modTicket extends DolibarrModules
$this->boxes = array( $this->boxes = array(
0 => array('file' => 'box_last_ticket.php', 'enabledbydefaulton' => 'Home'), 0 => array('file' => 'box_last_ticket.php', 'enabledbydefaulton' => 'Home'),
1 => array('file' => 'box_last_modified_ticket.php', 'enabledbydefaulton' => 'Home'), 1 => array('file' => 'box_last_modified_ticket.php', 'enabledbydefaulton' => 'Home'),
2 => array('file' => 'box_ticket_by_severity.php', 'enabledbydefaulton' => 'ticketindex'), 2 => array('file' => 'box_graph_ticket_by_severity.php', 'enabledbydefaulton' => 'ticketindex'),
3 => array('file' => 'box_graph_nb_ticket_last_x_days.php', 'enabledbydefaulton' => 'ticketindex'), 3 => array('file' => 'box_graph_nb_ticket_last_x_days.php', 'enabledbydefaulton' => 'ticketindex'),
4 => array('file' => 'box_graph_nb_tickets_type.php', 'enabledbydefaulton' => 'ticketindex'), 4 => array('file' => 'box_graph_nb_tickets_type.php', 'enabledbydefaulton' => 'ticketindex'),
5 => array('file' => 'box_new_vs_close_ticket.php', 'enabledbydefaulton' => 'ticketindex') 5 => array('file' => 'box_new_vs_close_ticket.php', 'enabledbydefaulton' => 'ticketindex')