Updates to release v3.2.0 fix #818 fix #819

.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?

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

composer.json

@@ -31,7 +31,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.1.x-dev"
+            "dev-master": "3.2.x-dev"
         }
     }
 }

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;

src/ActionColumnAsset.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/BooleanColumn.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/CheckboxColumn.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/CheckboxColumnAsset.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/ColumnTrait.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/DataColumn.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/Demo.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/EditableColumn.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/EditableColumnAction.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/EditableColumnAsset.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/ExpandRowColumn.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/ExpandRowColumnAsset.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/FormulaColumn.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/GridExportAsset.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/GridFloatHeadAsset.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/GridGroupAsset.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/GridPerfectScrollbarAsset.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/GridResizeColumnsAsset.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/GridResizeStoreAsset.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/GridToggleDataAsset.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/GridView.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; 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 => [

src/GridViewAsset.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/Module.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/RadioColumn.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/RadioColumnAsset.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/SerialColumn.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2018
- * @version   3.1.9
+ * @version   3.2.0
  */
 
 namespace kartik\grid;

src/controllers/ExportController.php

@@ -4,7 +4,7 @@
  * @package   yii2-grid
  * @author    Kartik Visweswaran <[email protected]>
  * @copyright Copyright &copy; 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();
     }
 
     /**