Commit 23f8988b by Qiang Xue

Merge pull request #2384 from zelenin/gridview-header-fix

gridview header/footer fix
parents 67b8d6cd 4583c179
......@@ -279,13 +279,14 @@ class GridView extends BaseListView
/** @var Column $column */
$cells[] = $column->renderHeaderCell();
}
$content = implode('', $cells);
$content = Html::tag('tr', implode('', $cells), $this->headerRowOptions);
if ($this->filterPosition == self::FILTER_POS_HEADER) {
$content = $this->renderFilters() . $content;
} elseif ($this->filterPosition == self::FILTER_POS_BODY) {
$content .= $this->renderFilters();
}
return "<thead>\n" . Html::tag('tr', $content, $this->headerRowOptions) . "\n</thead>";
return "<thead>\n" . $content . "\n</thead>";
}
/**
......@@ -299,11 +300,11 @@ class GridView extends BaseListView
/** @var Column $column */
$cells[] = $column->renderFooterCell();
}
$content = implode('', $cells);
$content = Html::tag('tr', implode('', $cells), $this->footerRowOptions);
if ($this->filterPosition == self::FILTER_POS_FOOTER) {
$content .= $this->renderFilters();
}
return "<tfoot>\n" . Html::tag('tr', $content, $this->footerRowOptions) . "\n</tfoot>";
return "<tfoot>\n" . $content . "\n</tfoot>";
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment