From 35b6766cd1dfe3d1b661e36b8f6bab783233c1d9 Mon Sep 17 00:00:00 2001 From: Kartik Visweswaran Date: Thu, 15 Nov 2018 20:48:34 +0530 Subject: [PATCH] Update to release v1.3.8 fixes #284 --- CHANGE.md | 6 ++++++ src/ExportColumnAsset.php | 2 +- src/ExportMenu.php | 5 +++-- src/ExportMenuAsset.php | 2 +- src/ExportWriterPdf.php | 2 +- src/assets/css/kv-export-columns.css | 2 +- src/assets/css/kv-export-columns.min.css | 2 +- src/assets/js/kv-export-columns.js | 2 +- src/assets/js/kv-export-columns.min.js | 2 +- src/assets/js/kv-export-data.js | 2 +- src/assets/js/kv-export-data.min.js | 2 +- src/views/_columns.php | 2 +- src/views/_view.php | 2 +- 13 files changed, 20 insertions(+), 13 deletions(-) diff --git a/CHANGE.md b/CHANGE.md index 5de1b64..46c154a 100755 --- 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 index 88a15ab..a79550e 100644 --- a/src/ExportColumnAsset.php +++ b/src/ExportColumnAsset.php @@ -3,7 +3,7 @@ /** * @copyright Copyright © 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 index 328b1a9..cd47b3a 100644 --- a/src/ExportMenu.php +++ b/src/ExportMenu.php @@ -4,7 +4,7 @@ * @package yii2-export * @author Kartik Visweswaran * @copyright Copyright © 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 index a513cb2..49748ca 100644 --- a/src/ExportMenuAsset.php +++ b/src/ExportMenuAsset.php @@ -3,7 +3,7 @@ /** * @copyright Copyright © 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 index 0361fdb..4b42033 100644 --- a/src/ExportWriterPdf.php +++ b/src/ExportWriterPdf.php @@ -3,7 +3,7 @@ /** * @copyright Copyright © 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 index 97491a2..ea779ce 100644 --- 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 * @copyright Copyright © 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 index abca9b3..6f051a5 100644 --- 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 * @copyright Copyright © 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 index 322d4aa..191afa8 100644 --- 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 * @copyright Copyright © 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 index 5a5d0df..c44fb8d 100644 --- 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 * @copyright Copyright © 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 index 2fbc8a0..a158a0d 100644 --- 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 * @copyright Copyright © 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 index d96a6ac..27a9abd 100644 --- a/src/assets/js/kv-export-data.min.js +++ b/src/assets/js/kv-export-data.min.js @@ -2,7 +2,7 @@ * @package yii2-export * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2015 - 2018 - * @version 1.3.7 + * @version 1.3.8 * * Export Data Validation Module. * diff --git a/src/views/_columns.php b/src/views/_columns.php index 2c12158..57b71dc 100644 --- a/src/views/_columns.php +++ b/src/views/_columns.php @@ -3,7 +3,7 @@ * @package yii2-export * @author Kartik Visweswaran * @copyright Copyright © 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 index 6a127b8..c7c2181 100644 --- a/src/views/_view.php +++ b/src/views/_view.php @@ -3,7 +3,7 @@ * @package yii2-export * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2015 - 2018 - * @version 1.3.7 + * @version 1.3.8 * * Export Submission View *