From 632f0f6f9009973ca3afdca992bc61a94b3acc93 Mon Sep 17 00:00:00 2001 From: ankita chavan Date: Wed, 28 Oct 2020 09:59:35 +0530 Subject: [PATCH 1/2] Bug#165966 fix: JSN Template > Frontend > Vendor Reports > Check description for all changes --- tjreports/site/models/reports.php | 6 +++++- tjreports/site/views/reports/view.base.php | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/tjreports/site/models/reports.php b/tjreports/site/models/reports.php index 2cd5968..d52cd40 100755 --- a/tjreports/site/models/reports.php +++ b/tjreports/site/models/reports.php @@ -578,7 +578,11 @@ protected function populateState($ordering = '', $direction = 'ASC') $reportParams = $this->getReportParams($reportId); $colToshow = (array) $reportParams->get("colToshow"); $piiColumns = (array) $reportParams->get("piiColumns"); - $piiColumns = array_flip($piiColumns); + + if ($reportParams->get("piiColumns")) + { + $piiColumns = array_flip($piiColumns); + } if (!empty($piiColumns)) { diff --git a/tjreports/site/views/reports/view.base.php b/tjreports/site/views/reports/view.base.php index ca455f4..91ca551 100644 --- a/tjreports/site/views/reports/view.base.php +++ b/tjreports/site/views/reports/view.base.php @@ -189,7 +189,11 @@ public function processData($type = 'html') $this->headerLevel = $this->model->headerLevel; // Array_key - defaultColToHide column are present then get the key as value. - $defaultColToHide = (array) $this->model->getState('defaultColToHide'); + if ($this->model->getState('defaultColToHide')) + { + $this->defaultColToHide = array_keys($this->model->getState('defaultColToHide')); + } + $this->defaultColToHide = array_keys($defaultColToHide); $this->columns = $this->model->columns; From 87c6b42c2454a37fa7ddb22e39904ebe144e15f0 Mon Sep 17 00:00:00 2001 From: ankita chavan Date: Tue, 3 Nov 2020 16:30:14 +0530 Subject: [PATCH 2/2] Bug#165966 fix: Resolved comments --- tjreports/site/models/reports.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tjreports/site/models/reports.php b/tjreports/site/models/reports.php index d52cd40..0837d05 100755 --- a/tjreports/site/models/reports.php +++ b/tjreports/site/models/reports.php @@ -579,7 +579,7 @@ protected function populateState($ordering = '', $direction = 'ASC') $colToshow = (array) $reportParams->get("colToshow"); $piiColumns = (array) $reportParams->get("piiColumns"); - if ($reportParams->get("piiColumns")) + if (!empty($reportParams->get("piiColumns"))) { $piiColumns = array_flip($piiColumns); }