Fix #283: Correct export columns validation

kartik-v · Nov 10, 2018 · e4c2fd5 · e4c2fd5
1 parent e4a1e46
commit e4c2fd5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/CHANGE.md b/CHANGE.md
@@ -3,8 +3,10 @@ Change Log: `yii2-export`
 
 ## version 1.3.7
 
-**Date:** _under development_
+**Date:** 10-Nov-2018
 
+- (enh #283): Correct export columns validation.
+- (enh #282): Include use `yii\db\QueryInterface`.
 - (enh #281): Correct export download to allow parsing new lines in content.
 - (enh #280): Correct attribute label parsing.
 - Update README.

diff --git a/src/ExportMenu.php b/src/ExportMenu.php
@@ -1224,7 +1224,7 @@ public function setVisibleColumns()
         $columns = [];
         foreach ($this->columns as $key => $column) {
             $isActionColumn = $column instanceof ActionColumn;
-            $isNoExport = in_array($key, $this->noExportColumns);
+            $isNoExport = in_array($key, $this->noExportColumns) || !in_array($key, $this->selectedColumns);
             if ($isActionColumn && !$isNoExport) {
                 $this->noExportColumns[] = $key;
             }

diff --git a/src/ExportWriterPdf.php b/src/ExportWriterPdf.php
@@ -97,7 +97,7 @@ public function save($pFilename)
                 'SetAuthor' => $properties->getCreator(),
                 'SetSubject' => $properties->getSubject(),
                 'SetKeywords' => $properties->getKeywords(),
-                'SetCreator' => $properties->getCreator()
+                'SetCreator' => $properties->getCreator(),
             ],
         ]);
         $content = $this->generateHTMLHeader(false) . $this->generateSheetData() . $this->generateHTMLFooter();

diff --git a/src/assets/js/kv-export-data.js b/src/assets/js/kv-export-data.js
@@ -139,6 +139,7 @@
                 });
                 expCols = JSON.stringify(cols);
             }
+            console.log(expCols);
             $form = $('<form/>', frmConfig).append($csrf)
                 .append(getInput(cfg.exportTypeParam, fmt), getInput(cfg.exportRequestParam, 1))
                 .append(getInput(cfg.exportColsParam, expCols), getInput(cfg.colSelFlagParam, cfg.colSelEnabled))