Update to release v1.3.8 fixes #284

kartik-v · Nov 15, 2018 · 35b6766 · 35b6766
1 parent e4c2fd5
commit 35b6766
Show file tree

Hide file tree

Showing 13 changed files with 20 additions and 13 deletions.
diff --git a/CHANGE.md b/CHANGE.md
@@ -1,6 +1,12 @@
 Change Log: `yii2-export`
 =========================
 
+## version 1.3.8
+
+**Date:** _under development_
+
+- (bug #284): Correct validation when `showColumnSelector` is `false`.
+
 ## version 1.3.7
 
 **Date:** 10-Nov-2018

diff --git a/src/ExportColumnAsset.php b/src/ExportColumnAsset.php
@@ -3,7 +3,7 @@
 /**
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2018
  * @package yii2-export
- * @version 1.3.7
+ * @version 1.3.8
  */
 
 namespace kartik\export;

diff --git a/src/ExportMenu.php b/src/ExportMenu.php
@@ -4,7 +4,7 @@
  * @package   yii2-export
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2018
- * @version   1.3.7
+ * @version   1.3.8
  */
 
 namespace kartik\export;
@@ -1224,7 +1224,8 @@ public function setVisibleColumns()
         $columns = [];
         foreach ($this->columns as $key => $column) {
             $isActionColumn = $column instanceof ActionColumn;
-            $isNoExport = in_array($key, $this->noExportColumns) || !in_array($key, $this->selectedColumns);
+            $isNoExport = in_array($key, $this->noExportColumns) || 
+                ($this->showColumnSelector && is_array($this->selectedColumns) && !in_array($key, $this->selectedColumns));
             if ($isActionColumn && !$isNoExport) {
                 $this->noExportColumns[] = $key;
             }

diff --git a/src/ExportMenuAsset.php b/src/ExportMenuAsset.php
@@ -3,7 +3,7 @@
 /**
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2018
  * @package yii2-export
- * @version 1.3.7
+ * @version 1.3.8
  */
 
 namespace kartik\export;

diff --git a/src/ExportWriterPdf.php b/src/ExportWriterPdf.php
@@ -3,7 +3,7 @@
 /**
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2018
  * @package yii2-export
- * @version 1.3.7
+ * @version 1.3.8
  */
 
 namespace kartik\export;

diff --git a/src/assets/css/kv-export-columns.css b/src/assets/css/kv-export-columns.css
@@ -2,7 +2,7 @@
  * @package   yii2-export
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2018
- * @version   1.3.7
+ * @version   1.3.8
  *
  * Export Columns Selector Style Sheet
  *

diff --git a/src/assets/css/kv-export-columns.min.css b/src/assets/css/kv-export-columns.min.css
@@ -2,7 +2,7 @@
  * @package   yii2-export
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2018
- * @version   1.3.7
+ * @version   1.3.8
  *
  * Export Columns Selector Style Sheet
  *

diff --git a/src/assets/js/kv-export-columns.js b/src/assets/js/kv-export-columns.js
@@ -2,7 +2,7 @@
  * @package   yii2-export
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2018
- * @version   1.3.7
+ * @version   1.3.8
  *
  * Export Columns Selector Validation Module.
  *

diff --git a/src/assets/js/kv-export-columns.min.js b/src/assets/js/kv-export-columns.min.js
@@ -2,7 +2,7 @@
  * @package   yii2-export
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2018
- * @version   1.3.7
+ * @version   1.3.8
  *
  * Export Columns Selector Validation Module.
  *

diff --git a/src/assets/js/kv-export-data.js b/src/assets/js/kv-export-data.js
@@ -2,7 +2,7 @@
  * @package   yii2-export
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2018
- * @version   1.3.7
+ * @version   1.3.8
  *
  * Export Data Validation Module.
  *

diff --git a/src/assets/js/kv-export-data.min.js b/src/assets/js/kv-export-data.min.js
diff --git a/src/views/_columns.php b/src/views/_columns.php
@@ -3,7 +3,7 @@
  * @package   yii2-export
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2018
- * @version   1.3.7
+ * @version   1.3.8
  * 
  * Column Selector View
  *

diff --git a/src/views/_view.php b/src/views/_view.php
@@ -3,7 +3,7 @@
  * @package   yii2-export
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2015 - 2018
- * @version   1.3.7
+ * @version   1.3.8
  *
  * Export Submission View
  *