diff --git a/tjreports/administrator/models/tjreport.php b/tjreports/administrator/models/tjreport.php index 5ed7eeb..8222d1c 100644 --- a/tjreports/administrator/models/tjreport.php +++ b/tjreports/administrator/models/tjreport.php @@ -175,7 +175,9 @@ public function getReportPluginData($pluginId, $pluginName = null) $defaultColToHide = $plgModel->getState('defaultColToHide'); - $params = array(); + $params = array(); + $customParam = new stdClass; + $params['filter_order'] = $plgModel->getState('list.ordering'); $params['filter_order_Dir'] = $plgModel->getState('list.direction'); $params['limit'] = $plgModel->getState('list.limit'); @@ -192,6 +194,7 @@ public function getReportPluginData($pluginId, $pluginName = null) $params['showHideColumns'] = $plgModel->showhideCols; $params['piiColumns'] = $plgModel->getState('piiColumns'); + $params['customParam'] = $customParam; $report->param = json_encode($params); } diff --git a/tjreports/site/models/reports.php b/tjreports/site/models/reports.php index 70728a6..578897d 100755 --- a/tjreports/site/models/reports.php +++ b/tjreports/site/models/reports.php @@ -49,6 +49,9 @@ class TjreportsModelReports extends ListModel // Columns array contain PII columns private $piiColumns = array(); + // Columns array contain Custom Param + public $customParam = array(); + // Columns array contain email columns private $emailColumn = ''; @@ -1292,6 +1295,11 @@ private function processSavedReportColumns($queryId, &$selColToshow) $this->filterShowhideCols = array_diff($this->filterShowhideCols, $param['piiColumns']); } + if (isset($param['customParam'])) + { + $this->customParam = (array) $param['customParam']; + } + $parent = $queryData->parent; } else