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

This commit is contained in:
cgfhtw
2023-07-19 11:15:40 +02:00
26 changed files with 912 additions and 540 deletions
@@ -60,7 +60,7 @@ EOSQL;
* @param string funktion_kurzbz
* @return array
*/
public function getPresetByDashboardAndFunktion($dashboard_id, $funktion_kurzbz)
public function getPresetByDashboardAndFunktion($dashboard_id, $funktion_kurzbz)
{
return $this->loadWhere(array('dashboard_id' => $dashboard_id, 'funktion_kurzbz' => $funktion_kurzbz));
}
@@ -12,5 +12,4 @@ class Dashboard_Widget_model extends DB_Model
$this->pk = ['dashboard_id', 'widget_id'];
$this->hasSequence = false;
}
}
@@ -29,5 +29,4 @@ class Widget_model extends DB_Model
return $this->loadWhere(['dashboard_kurzbz' => $db]);
}
}