OpenEcoLab-LasAlpujarras
/
farmOS
mirror of https://github.com/farmOS/farmOS.git
3
0
Fork 0
Code Wiki

Only check if $limit is empty, not $offset.

This commit is contained in:
Michael Stenta 2020-08-25 09:03:00 -04:00
parent 0241b06c40
commit 8656d1a5d5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/farm/farm_sensor/farm_sensor_listener/farm_sensor_listener.module
View File

@ -466,9 +466,10 @@ function farm_sensor_listener_process_notifications($sensor, $data_name, $value)
* @param $end
* Filter data to timestamps less than or equal to this end timestamp.
* @param $limit
* The number of results to return.
* The number of results to return. Defaults to 1. If this is 0, no limit will
* be applied.
* @param $offset
* The value to start at.
* The value to start at, used in combination with $limit.
*
* @return array
* Returns an array of data.
@ -498,9 +499,8 @@ function farm_sensor_listener_data($id, $name = '', $start = NULL, $end = NULL,
// Order by timestamp descending.
$query->orderBy('fsd.timestamp', 'DESC');
// Limit the results.
// Don't apply a range if both offset and limit are NULL.
if (!empty($offset) && !empty($limit)) {
// Limit the results, if $limit is not empty.
if (!empty($limit)) {
$query->range($offset, $limit);
}
@ -816,7 +816,7 @@ function farm_sensor_listener_data_graphs_form($form, &$form_state, $asset) {
$id = drupal_html_id('sensor-data-' . $name);
// Load data.
$data = farm_sensor_listener_data($asset->id, $name, strtotime($filters['start_date']), strtotime($filters['end_date']), NULL, NULL);
$data = farm_sensor_listener_data($asset->id, $name, strtotime($filters['start_date']), strtotime($filters['end_date']), 0);
// Don't render a graph if there is no data to display.
if (empty($data)) {