Merge branch 'feature-24647/Konfigurierbare_Dashboards' into feature-25999/C4

This commit is contained in:
cgfhtw
2023-02-09 16:12:36 +01:00
10 changed files with 231 additions and 28 deletions
@@ -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]);
}