Merge branch 'spidev' into 'master'
Pop Update See merge request fronk/thetool!1690
This commit is contained in:
@@ -68,7 +68,6 @@ class PoprackModel
|
|||||||
$oldrackid = "";
|
$oldrackid = "";
|
||||||
$counter = -1;
|
$counter = -1;
|
||||||
while ($data = $db->fetch_array($res)) {
|
while ($data = $db->fetch_array($res)) {
|
||||||
|
|
||||||
if ($oldrackid != $data['id']) {
|
if ($oldrackid != $data['id']) {
|
||||||
$counter++;
|
$counter++;
|
||||||
$items[$counter]['rack']['id'] = $data['id'];
|
$items[$counter]['rack']['id'] = $data['id'];
|
||||||
@@ -78,7 +77,7 @@ class PoprackModel
|
|||||||
}
|
}
|
||||||
if ($data['modulname']) {
|
if ($data['modulname']) {
|
||||||
if ($data['device_id']) {
|
if ($data['device_id']) {
|
||||||
$items[$counter]['modules'][$data['start_he']]['slots'][$data['moduleid']]['device_id'] = $data['device_id'];
|
$items[$counter]['modules'][$data['moduleside']][$data['start_he']]['slots'][$data['moduleid']]['device_id'] = $data['device_id'];
|
||||||
}
|
}
|
||||||
$items[$counter]['modules'][$data['moduleside']][$data['start_he']]['start_he'] = $data['start_he'];
|
$items[$counter]['modules'][$data['moduleside']][$data['start_he']]['start_he'] = $data['start_he'];
|
||||||
$items[$counter]['modules'][$data['moduleside']][$data['start_he']]['end_he'] = $data['end_he'];
|
$items[$counter]['modules'][$data['moduleside']][$data['start_he']]['end_he'] = $data['end_he'];
|
||||||
|
|||||||
Reference in New Issue
Block a user