Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug165966 fix: JSN Template > Frontend > Vendor Reports > Check description for all changes #197

Open
wants to merge 1 commit into
base: release-1.2.0
Choose a base branch
from
Open

Bug165966 fix: JSN Template > Frontend > Vendor Reports > Check description for all changes #197

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion tjreports/site/models/reports.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,11 @@ protected function populateState($ordering = '', $direction = 'ASC')
$reportParams = $this->getReportParams($reportId);

$colToshow = $reportParams->get("colToshow");
$piiColumns = array_flip($reportParams->get("piiColumns"));

if ($reportParams->get("piiColumns"))
{
$piiColumns = array_flip($reportParams->get("piiColumns"));
}

if (!empty($piiColumns))
{
Expand Down
6 changes: 5 additions & 1 deletion tjreports/site/views/reports/view.base.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,11 @@ public function processData($type = 'html')
$this->headerLevel = $this->model->headerLevel;

// Array_key - defaultColToHide column are present then get the key as value.
$this->defaultColToHide = array_keys($this->model->getState('defaultColToHide'));
if ($this->model->getState('defaultColToHide'))
{
$this->defaultColToHide = array_keys($this->model->getState('defaultColToHide'));
}

$this->columns = $this->model->columns;

/* Array_merge - here colToshow means get all true value array so want to mearg defaultColToHide column and then using
Expand Down