Skip to content

Commit

Permalink
Fix #958: Correct ExpandRowColumn expand all & collapse all
Browse files Browse the repository at this point in the history
  • Loading branch information
kartik-v committed Jul 8, 2020
1 parent 8d2b199 commit 3199b40
Show file tree
Hide file tree
Showing 47 changed files with 69 additions and 58 deletions.
8 changes: 8 additions & 0 deletions CHANGE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
Change Log: `yii2-grid`
=======================

## Version 3.3.6

**Date:** _under development_

- (bug #959): Correct `filterOptions` column seq setting in ColumnTrait.
- (bug #958): Correct ExpandRowColumn expand all & collapse all.
- (enh #956): Update Portugese Brazilian Translations.

## Version 3.3.5

**Date:** 27-Mar-2020
Expand Down
2 changes: 1 addition & 1 deletion src/ActionColumn.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/**
* @copyright Copyright © Kartik Visweswaran, Krajee.com, 2014 - 2020
* @package yii2-grid
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/ActionColumnAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/BooleanColumn.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/CheckboxColumn.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/CheckboxColumnAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/ColumnTrait.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/DataColumn.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/Demo.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/EditableColumn.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/EditableColumnAction.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/EditableColumnAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/EnumColumn.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
10 changes: 5 additions & 5 deletions src/ExpandRowColumn.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down Expand Up @@ -322,10 +322,10 @@ public function getDataCellValue($model, $key, $index)
/** @noinspection PhpUnusedLocalVariableInspection */
$icon = '';
if ($value === GridView::ROW_EXPANDED) {
$type = 'collapsed';
$type = 'expanded';
$icon = $this->collapseIcon;
} elseif ($value === GridView::ROW_COLLAPSED) {
$type = 'expanded';
$type = 'collapsed';
$icon = $this->expandIcon;
} else {
return $value;
Expand Down Expand Up @@ -416,10 +416,10 @@ protected function renderHeaderCellContent()
return parent::renderHeaderCellContent();
}
$icon = $this->expandIcon;
$css = 'kv-expand-header-icon kv-state-collapsed';
$css = 'kv-expand-header-icon kv-state-expanded';
if ($this->defaultHeaderState === GridView::ROW_EXPANDED) {
$icon = $this->collapseIcon;
$css = 'kv-expand-header-icon kv-state-expanded';
$css = 'kv-expand-header-icon kv-state-collapsed';
}
return "<div class='{$css}'>{$icon}</div>";
}
Expand Down
2 changes: 1 addition & 1 deletion src/ExpandRowColumnAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/FormulaColumn.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/GridExportAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/GridFloatHeadAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/GridGroupAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/GridPerfectScrollbarAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/GridResizeColumnsAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/GridResizeStoreAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/GridToggleDataAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/GridView.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/GridViewAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/Module.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/RadioColumn.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/RadioColumnAsset.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/SerialColumn.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*/

namespace kartik\grid;
Expand Down
2 changes: 1 addition & 1 deletion src/assets/css/kv-grid-expand.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*
* Gridview ExpandRowColumn styling and enhancements
*
Expand Down
2 changes: 1 addition & 1 deletion src/assets/css/kv-grid-expand.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/assets/css/kv-grid.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*
* Yii2 Gridview widget styling and enhancements for Bootstrap.
*
Expand Down
2 changes: 1 addition & 1 deletion src/assets/css/kv-grid.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/assets/js/kv-grid-checkbox.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*
* Client actions for kartik\grid\CheckboxColumn
*
Expand Down
2 changes: 1 addition & 1 deletion src/assets/js/kv-grid-checkbox.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/assets/js/kv-grid-editable.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*
* Client actions for yii2-grid EditableColumn
*
Expand Down
2 changes: 1 addition & 1 deletion src/assets/js/kv-grid-editable.min.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @package yii2-grid
* @author Kartik Visweswaran <kartikv2@gmail.com>
* @copyright Copyright &copy; Kartik Visweswaran, Krajee.com, 2014 - 2020
* @version 3.3.5
* @version 3.3.6
*
* Client actions for yii2-grid EditableColumn
*
Expand Down
Loading

0 comments on commit 3199b40

Please sign in to comment.