Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'devbyspi'

Browse Source 
# Conflicts:
#   Layout/default/Device/Detail.php
#   Layout/default/Device/Form.php
#   Layout/default/Device/Index.php
#   application/Device/DeviceController.php
#   application/Device/DeviceModel.php
#   public/assets/css/datatables-std.css
This commit is contained in:
Frank Schubert
2023-03-22 14:36:13 +00:00
parent 0ce064b56b 61e84f085d
commit 95a452bba7
99 changed files with 60682 additions and 831 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/Device/DeviceModel.php
View File

@@ -108,8 +108,8 @@ class DeviceModel
$db = FronkDB::singleton();
$where = self::getSqlFilter($filter);
$res = $db->select("Device", "*", "$where ORDER BY name");
if ($db->num_rows($res)) {
while ($data = $db->fetch_object($res)) {
if($db->num_rows($res)) {
while($data = $db->fetch_object($res)) {
$items[] = new Device($data);
}
}
@@ -121,9 +121,9 @@ class DeviceModel
$where = "1=1 ";
//var_dump($filter);exit;
if (array_key_exists("pop_id", $filter)) {
if(array_key_exists("pop_id", $filter)) {
$popid = $filter['pop_id'];
if (is_numeric($popid)) {
if(is_numeric($popid)) {
$where .= " AND pop_id=$popid";
}
}