From c03ff9694540eebf704a87d11d973f977905a52d Mon Sep 17 00:00:00 2001 From: Kartik Visweswaran Date: Sun, 9 Sep 2018 16:32:50 +0530 Subject: [PATCH] Updates to release v3.2.0 fix #818 fix #819 --- .github/CONTRIBUTING.md | 2 +- CHANGE.md | 8 ++++++++ composer.json | 2 +- src/ActionColumn.php | 3 +-- src/ActionColumnAsset.php | 2 +- src/BooleanColumn.php | 2 +- src/CheckboxColumn.php | 2 +- src/CheckboxColumnAsset.php | 2 +- src/ColumnTrait.php | 2 +- src/DataColumn.php | 2 +- src/Demo.php | 2 +- src/EditableColumn.php | 2 +- src/EditableColumnAction.php | 2 +- src/EditableColumnAsset.php | 2 +- src/ExpandRowColumn.php | 2 +- src/ExpandRowColumnAsset.php | 2 +- src/FormulaColumn.php | 2 +- src/GridExportAsset.php | 2 +- src/GridFloatHeadAsset.php | 2 +- src/GridGroupAsset.php | 2 +- src/GridPerfectScrollbarAsset.php | 2 +- src/GridResizeColumnsAsset.php | 2 +- src/GridResizeStoreAsset.php | 2 +- src/GridToggleDataAsset.php | 2 +- src/GridView.php | 8 +++++--- src/GridViewAsset.php | 2 +- src/Module.php | 2 +- src/RadioColumn.php | 2 +- src/RadioColumnAsset.php | 2 +- src/SerialColumn.php | 2 +- src/controllers/ExportController.php | 11 +++++------ 31 files changed, 46 insertions(+), 38 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index bd04e2dc..2beed98f 100755 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -9,7 +9,7 @@ When [reporting bugs][reporting-bugs] or [issue tracker on GitHub][issue-tracker] is the recommended channel to use. The issue tracker **is not** a place for support requests. Refer the -[extension documentation and demos](http://demos.krajee.com/dynagrid) and/or refer to the +[extension documentation and demos](http://demos.krajee.com/grid) and/or refer to the [webtips Q & A forum](http://webtips.krajee.com/questions) which are the better places to get help. How to contribute via a pull request? diff --git a/CHANGE.md b/CHANGE.md index 28777c7b..6b72f3a4 100755 --- a/CHANGE.md +++ b/CHANGE.md @@ -1,6 +1,14 @@ Change Log: `yii2-grid` ======================= +## Version 3.2.0 + +**Date:** _under development_ + +- (enh #819): Enhance grid export generation for PJAX grids (correct timestamp). +- (enh #818): Correct PDF Export Generation response. +- (enh #816): Fix typo in check if has `xlFormat`. + ## Version 3.1.9 **Date:** 07-Sep-2018 diff --git a/composer.json b/composer.json index ab987ed9..0e28db2e 100755 --- a/composer.json +++ b/composer.json @@ -31,7 +31,7 @@ }, "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-master": "3.2.x-dev" } } } \ No newline at end of file diff --git a/src/ActionColumn.php b/src/ActionColumn.php index 71ade783..e3d3a80d 100644 --- a/src/ActionColumn.php +++ b/src/ActionColumn.php @@ -3,12 +3,11 @@ /** * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 * @package yii2-grid - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; -use Closure; use Yii; use yii\grid\ActionColumn as YiiActionColumn; use yii\helpers\ArrayHelper; diff --git a/src/ActionColumnAsset.php b/src/ActionColumnAsset.php index c8f23d96..51de0ef3 100644 --- a/src/ActionColumnAsset.php +++ b/src/ActionColumnAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/BooleanColumn.php b/src/BooleanColumn.php index 9213b036..9969ba24 100644 --- a/src/BooleanColumn.php +++ b/src/BooleanColumn.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/CheckboxColumn.php b/src/CheckboxColumn.php index b92d325e..3357036c 100644 --- a/src/CheckboxColumn.php +++ b/src/CheckboxColumn.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/CheckboxColumnAsset.php b/src/CheckboxColumnAsset.php index 809c5d16..5b7a3204 100644 --- a/src/CheckboxColumnAsset.php +++ b/src/CheckboxColumnAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/ColumnTrait.php b/src/ColumnTrait.php index d16751b8..67e10679 100644 --- a/src/ColumnTrait.php +++ b/src/ColumnTrait.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/DataColumn.php b/src/DataColumn.php index bc036534..7d400286 100644 --- a/src/DataColumn.php +++ b/src/DataColumn.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/Demo.php b/src/Demo.php index 1cc1d5df..01ef81d9 100644 --- a/src/Demo.php +++ b/src/Demo.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/EditableColumn.php b/src/EditableColumn.php index 57f6f3f6..55f1ceb4 100644 --- a/src/EditableColumn.php +++ b/src/EditableColumn.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/EditableColumnAction.php b/src/EditableColumnAction.php index dcdf7aae..983c2b8a 100644 --- a/src/EditableColumnAction.php +++ b/src/EditableColumnAction.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/EditableColumnAsset.php b/src/EditableColumnAsset.php index f8cdfa5c..88ac8494 100644 --- a/src/EditableColumnAsset.php +++ b/src/EditableColumnAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/ExpandRowColumn.php b/src/ExpandRowColumn.php index f4ab3498..6c30494c 100644 --- a/src/ExpandRowColumn.php +++ b/src/ExpandRowColumn.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/ExpandRowColumnAsset.php b/src/ExpandRowColumnAsset.php index 0ea9bc0a..73fca6c5 100644 --- a/src/ExpandRowColumnAsset.php +++ b/src/ExpandRowColumnAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/FormulaColumn.php b/src/FormulaColumn.php index ed97fdbb..f07112df 100644 --- a/src/FormulaColumn.php +++ b/src/FormulaColumn.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/GridExportAsset.php b/src/GridExportAsset.php index 37eda4e2..fbd326fd 100644 --- a/src/GridExportAsset.php +++ b/src/GridExportAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/GridFloatHeadAsset.php b/src/GridFloatHeadAsset.php index e136aa03..8d0bc779 100644 --- a/src/GridFloatHeadAsset.php +++ b/src/GridFloatHeadAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/GridGroupAsset.php b/src/GridGroupAsset.php index 8743c363..2ae9db24 100644 --- a/src/GridGroupAsset.php +++ b/src/GridGroupAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/GridPerfectScrollbarAsset.php b/src/GridPerfectScrollbarAsset.php index ad296524..ff93a50d 100644 --- a/src/GridPerfectScrollbarAsset.php +++ b/src/GridPerfectScrollbarAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/GridResizeColumnsAsset.php b/src/GridResizeColumnsAsset.php index e156e828..09ef538e 100644 --- a/src/GridResizeColumnsAsset.php +++ b/src/GridResizeColumnsAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/GridResizeStoreAsset.php b/src/GridResizeStoreAsset.php index 1b4fc711..db1d6501 100644 --- a/src/GridResizeStoreAsset.php +++ b/src/GridResizeStoreAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/GridToggleDataAsset.php b/src/GridToggleDataAsset.php index 09e92594..a197dbb6 100644 --- a/src/GridToggleDataAsset.php +++ b/src/GridToggleDataAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/GridView.php b/src/GridView.php index 1a78c531..cb3b00be 100644 --- a/src/GridView.php +++ b/src/GridView.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; @@ -1537,7 +1537,7 @@ protected function initExport() 'color' => '#333333', ], 'R' => [ - 'content' => Yii::t('kvgrid', 'Generated') . ': ' . date('D, d-M-Y g:i a T'), + 'content' => Yii::t('kvgrid', 'Generated') . ': ' . date('D, d-M-Y'), 'font-size' => 8, 'color' => '#333333', ], @@ -1572,7 +1572,9 @@ protected function initExport() 'options' => ['title' => Yii::t('kvgrid', 'Hyper Text Markup Language')], 'mime' => 'text/html', 'config' => [ - 'cssFile' => 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css', + 'cssFile' => $this->isBs4() ? + 'https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css' : + 'https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css', ], ], self::CSV => [ diff --git a/src/GridViewAsset.php b/src/GridViewAsset.php index c83700c3..df3a48f2 100644 --- a/src/GridViewAsset.php +++ b/src/GridViewAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/Module.php b/src/Module.php index 792b1283..05f4f9dc 100644 --- a/src/Module.php +++ b/src/Module.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/RadioColumn.php b/src/RadioColumn.php index 0f91b719..d6d790b8 100644 --- a/src/RadioColumn.php +++ b/src/RadioColumn.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/RadioColumnAsset.php b/src/RadioColumnAsset.php index b4fe2f92..4a322d35 100644 --- a/src/RadioColumnAsset.php +++ b/src/RadioColumnAsset.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/SerialColumn.php b/src/SerialColumn.php index 8ee162af..f19e6b57 100644 --- a/src/SerialColumn.php +++ b/src/SerialColumn.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid; diff --git a/src/controllers/ExportController.php b/src/controllers/ExportController.php index 0656d883..08c31a7a 100644 --- a/src/controllers/ExportController.php +++ b/src/controllers/ExportController.php @@ -4,7 +4,7 @@ * @package yii2-grid * @author Kartik Visweswaran * @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2018 - * @version 3.1.9 + * @version 3.2.0 */ namespace kartik\grid\controllers; @@ -60,9 +60,7 @@ public function actionDownload() } if ($type == GridView::PDF) { $config = Json::decode($config); - $this->generatePDF($content, "{$name}.pdf", $config); - /** @noinspection PhpInconsistentReturnPointsInspection */ - return; + return $this->generatePDF($content, "{$name}.pdf", $config); } elseif ($type == GridView::HTML) { $content = HtmlPurifier::process($content); } elseif ($type == GridView::CSV || $type == GridView::TEXT) { @@ -83,7 +81,7 @@ public function actionDownload() * @param string $filename the file name * @param array $config the configuration for yii2-mpdf component * - * @return void + * @return Response */ protected function generatePDF($content, $filename, $config = []) { @@ -93,7 +91,8 @@ protected function generatePDF($content, $filename, $config = []) $config['methods']['SetCreator'] = [Yii::t('kvgrid', 'Krajee Yii2 Grid Export Extension')]; $config['content'] = $content; $pdf = new Pdf($config); - echo $pdf->render(); + Yii::$app->response->format = \yii\web\Response::FORMAT_RAW; + return $pdf->render(); } /**