Skip to content

Commit 5c5b45d

Browse files
committed
Merge pull request #161 from aschempp/dev
Fixed hideHead
2 parents 0f723f9 + 85f5215 commit 5c5b45d

1 file changed

Lines changed: 14 additions & 11 deletions

File tree

system/modules/multicolumnwizard/MultiColumnWizard.php

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -454,14 +454,18 @@ public function generate()
454454
{
455455
$this->activeRow = $i;
456456
$strHidden = '';
457-
$blnHiddenBody = false;
458457

459458
// Walk every column
460459
foreach ($this->columnFields as $strKey => $arrField)
461460
{
462461
$strWidget = '';
463462
$blnHiddenBody = false;
464463

464+
if ($arrField['eval']['hideHead'] == true)
465+
{
466+
$arrHiddenHeader[$strKey] = true;
467+
}
468+
465469
// load row specific data (useful for example for default values in different rows)
466470
if (isset($this->arrRowSpecificData[$i][$strKey]))
467471
{
@@ -494,11 +498,6 @@ public function generate()
494498
}
495499
elseif ($arrField['eval']['hideBody'] == true || $arrField['eval']['hideHead'] == true)
496500
{
497-
if ($arrField['eval']['hideHead'] == true)
498-
{
499-
$arrHiddenHeader[$strKey] = true;
500-
}
501-
502501
if ($arrField['eval']['hideBody'] == true)
503502
{
504503
$blnHiddenBody = true;
@@ -958,14 +957,18 @@ protected function generateTable($arrUnique, $arrDatepicker, $strHidden, $arrIte
958957

959958
if ($arrField['eval']['columnPos'])
960959
{
961-
$arrHeaderItems[$arrField['eval']['columnPos']] = (key_exists($strKey, $arrHiddenHeader)) ? '<td class="invisible">' : '<td>' . '</td>';
960+
$arrHeaderItems[$arrField['eval']['columnPos']] = '<td></td>';
962961
}
963962
else
964963
{
965-
$arrHeaderItems[] = (key_exists($strKey, $arrHiddenHeader)) ? '<td class="invisible">' : '<td>';
966-
$arrHeaderItems[] .= (is_array($arrField['label'])) ? $arrField['label'][0] : ($arrField['label'] != null ? $arrField['label'] : $strKey);
967-
$arrHeaderItems[] .= ((is_array($arrField['label']) && $arrField['label'][1] != '') ? '<span title="' . $arrField['label'][1] . '"><sup>(?)</sup></span>' : '');
968-
$arrHeaderItems[] .= '</td>';
964+
$strHeaderItem = '<td>';
965+
966+
$strHeaderItem .= (key_exists($strKey, $arrHiddenHeader)) ? '<div class="invisible">' : '';
967+
$strHeaderItem .= (is_array($arrField['label'])) ? $arrField['label'][0] : ($arrField['label'] != null ? $arrField['label'] : $strKey);
968+
$strHeaderItem .= ((is_array($arrField['label']) && $arrField['label'][1] != '') ? '<span title="' . $arrField['label'][1] . '"><sup>(?)</sup></span>' : '');
969+
$strHeaderItem .= (key_exists($strKey, $arrHiddenHeader)) ? '</div>' : '';
970+
971+
$arrHeaderItems[] = $strHeaderItem . '</td>';
969972
}
970973
}
971974

0 commit comments

Comments
 (0)