2010-11-17 Steffen Kamper <steffen@typo3.org>
+ * Fixed bug #16435: Headers in GridView are rendered wrong
* Follow-up to #16315: fixed an issue in ext_conf_template with mod menu
* Fixed bug #16434: GridView does not show cells if they are not mapped to any column
* Added feature #16334: Make FlexForms editable via TSConfig and group access lists (Thanks to Kai Vogel)
// create items and colPosList
if ($backendLayout['__config']['be_layout.'] && $backendLayout['__config']['be_layout.']['rows.']) {
foreach ($backendLayout['__config']['be_layout.']['rows.'] as $row) {
- if (true && count($row['columns.'])) {
foreach ($row['columns.'] as $column) {
- if (true) {
$backendLayout['__items'][] = array(
$column['name'],
$column['colPos'],
- null
+ NULL
);
$backendLayout['__colPosList'][] = $column['colPos'];
}
}
}
- }
- }
}
}
$this->itemLabels[$name] = $GLOBALS['LANG']->sL($val['label']);
}
-
// Select display mode:
if (!$this->tt_contentConfig['single']) { // MULTIPLE column display mode, side by side:
(isset($columnConfig['colspan']) ? ' colspan="' . $columnConfig['colspan'] . '"' : '') .
(isset($columnConfig['rowspan']) ? ' rowspan="' . $columnConfig['rowspan'] . '"' : '') .
' class="t3-gridCell t3-page-column t3-page-column-' . $columnKey .
- (isset($columnKey) ? ' t3-gridCell-disabled' : '') .
+ (!isset($columnConfig['colPos']) ? ' t3-gridCell-disabled' : '') .
(isset($columnConfig['colspan']) ? ' t3-gridCell-width' . $columnConfig['colspan'] : '') .
(isset($columnConfig['rowspan']) ? ' t3-gridCell-height' . $columnConfig['rowspan'] : '') . '">';
- $grid .= $head[$columnKey] . $content[$columnKey] . '</td>';
+ // Draw the pre-generated header with edit and new buttons if a colPos is assigned.
+ // If not, a new header without any buttons will be generated.
+ if (isset($columnConfig['colPos'])) {
+ $grid .= $head[$columnKey] . $content[$columnKey];
+ } else {
+ $grid .= $this->tt_content_drawColHeader($columnConfig['name'], '', '');
+ }
+
+ $grid .= '</td>';
}
$grid .= '</tr>';
}
include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/cms/layout/class.tx_cms_layout.php']);
}
-?>
\ No newline at end of file
+?>