Skip to content

Commit

Permalink
Merge pull request #251 from mg-code/master
Browse files Browse the repository at this point in the history
ExpandRowColumn: Bug with disabled closure, unnecessary check for title
  • Loading branch information
kartik-v committed Mar 17, 2015
2 parents 653e22f + 7acd2cc commit e51feba
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions ExpandRowColumn.php
Original file line number Diff line number Diff line change
Expand Up @@ -352,10 +352,8 @@ public function renderDataCell($model, $key, $index)
if ($this->value === GridView::ROW_EXPANDED) {
$options['title'] = $this->collapseTitle;
}
if ($this->disabled) {
if (static::parseData($this->disabled, $model, $key, $index, $this)) {
$css .= ' kv-state-disabled';
} elseif (!isset($options['title'])) {
$options['title'] = $title;
}
Html::addCssClass($options, $css);
$this->initPjax("kvExpandRow({$this->_hashVar});");
Expand Down

0 comments on commit e51feba

Please sign in to comment.