From d7c2362a0e7d4f2fd6784f6e849812cc179e6eb4 Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Tue, 22 Nov 2022 14:39:33 +0100 Subject: [PATCH] double widgets bug --- application/models/dashboard/Widget_model.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/models/dashboard/Widget_model.php b/application/models/dashboard/Widget_model.php index 4e5a31502..554c7dea6 100644 --- a/application/models/dashboard/Widget_model.php +++ b/application/models/dashboard/Widget_model.php @@ -15,8 +15,8 @@ class Widget_model extends DB_Model public function getWithAllowedForDashboard($dashboard_id) { $this->addSelect($this->dbTable . '.*'); - $this->addSelect('CASE WHEN dashboard_id = ? THEN 1 ELSE 0 END AS allowed', false); - $this->addJoin('dashboard.tbl_dashboard_widget', 'widget_id', 'LEFT'); + $this->addSelect('CASE WHEN dashboard_id IS NULL THEN 0 ELSE 1 END AS allowed', false); + $this->db->join('dashboard.tbl_dashboard_widget dw', $this->dbTable . '.widget_id=dw.widget_id AND dashboard_id = ?', 'LEFT', false); return $this->execQuery($this->db->get_compiled_select($this->dbTable), [$dashboard_id]); }