[Fmsystem-commits] [16881] property_soreport: get dataset

[sigurdne]

Revision: 16881
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16881
Author:   sigurdne
Date:     2017-06-28 06:48:56 -0400 (Wed, 28 Jun 2017)
Log Message:
-----------
property_soreport: get dataset

Modified Paths:
--------------
    trunk/property/inc/class.soreport.inc.php

Modified: trunk/property/inc/class.soreport.inc.php
===================================================================
--- trunk/property/inc/class.soreport.inc.php   2017-06-28 10:23:48 UTC (rev 
16880)
+++ trunk/property/inc/class.soreport.inc.php   2017-06-28 10:48:56 UTC (rev 
16881)
@@ -356,10 +356,12 @@
                {
                        $id = (int)$id;
 
+
                        if (count($data))
                        {
                                $dataset = $this->read_single_dataset($id);
                                $jsonB = $data;
+                               $dataset_id = $id;
                        }
                        else
                        {
@@ -366,6 +368,7 @@
                                $definition = $this->read_single($id);
                                $dataset = 
$this->read_single_dataset($definition['dataset_id']);
                                $jsonB = 
json_decode($definition['report_definition'], true);
+                               $dataset_id = (int)$definition['dataset_id'];
                        }
 
                        $string_columns = implode(',', $jsonB['columns']);
@@ -387,7 +390,7 @@
                                $ordering = 'ORDER BY ' . implode(', ', 
array_unique($array_order));
                        }
 
-                       $cond = $this->_build_conditions($jsonB['criteria'], 
$id);
+                       $cond = $this->_build_conditions($jsonB['criteria'], 
$dataset_id);
 
                        if ($cond)
                        {