Skip to content

Commit

Permalink
Merge branch 'dev' of gogitme.opmantek.com:open-audit into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
mark-unwin committed Nov 7, 2017
2 parents 8a3cf06 + e54a395 commit 6368148
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion code_igniter/application/controllers/devices.php
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,15 @@ private function read()
foreach ($temp as $table) {
if ($table != 'fields') {
$result = false;
$result = $this->m_devices->read_sub_resource($this->response->meta->id, $table, $this->response->meta->sub_resource_id, $this->response->meta->properties, '', $this->response->meta->limit);
$result = $this->m_devices->read_sub_resource(
$this->response->meta->id, #id
$table, #sub_resource
$this->response->meta->sub_resource_id, # sub id
$this->response->meta->properties, # properties
'', # sort
$this->response->meta->current, # current
$this->response->meta->limit # limit
);
if ($result !== false) {
$this->response->included = array_merge($this->response->included, $result);
}
Expand Down

0 comments on commit 6368148

Please sign in to comment.