1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 13:17:24 +02:00

render of hidden fields broken by tabs (admin UI)

This commit is contained in:
SecretR
2013-03-18 15:35:42 +02:00
parent a11e5a3d22
commit a76159f21c

View File

@@ -3243,14 +3243,16 @@ class e_form
} }
$text .= "</div>"; $text .= "</div>";
$text .= $this->renderCreateButtonsBar($elid, $data, $model, $tabId); // Create/Update Buttons etc.
} }
else // No Tabs Present else // No Tabs Present
{ {
$text .= $this->renderCreateFieldset($elid, $data, $model, false); $text .= $this->renderCreateFieldset($elid, $data, $model, false);
$text .= $this->renderCreateButtonsBar($elid, $data, $model, false); // Create/Update Buttons etc.
} }
$text .= $this->renderCreateButtonsBar($elid, $data, $model); // Create/Update Buttons etc.
} }
$text .= " $text .= "
@@ -3297,13 +3299,11 @@ class e_form
$hidden_fields = array(); $hidden_fields = array();
foreach($fdata['fields'] as $key => $att) foreach($fdata['fields'] as $key => $att)
{ {
if($tab !== false && varset($att['tab'], 0) !== $tab)
if($tab !== false && varset($att['tab'],0) !== $tab)
{ {
continue; continue;
} }
// convert aliases - not supported in edit mod // convert aliases - not supported in edit mod
if(vartrue($att['alias']) && !$model->hasData($key)) if(vartrue($att['alias']) && !$model->hasData($key))
{ {
@@ -3331,7 +3331,19 @@ class e_form
$keyName .= '['.$path.']'; $keyName .= '['.$path.']';
} }
} }
// print_a($att)."<br />";
if('hidden' === $att['type'])
{
if(!is_array($att['writeParms'])) parse_str(varset($att['writeParms']), $tmp);
else $tmp = $att['writeParms'];
if(!vartrue($tmp['show']))
{
continue;
}
unset($tmp);
}
// type null - system (special) fields // type null - system (special) fields
if(vartrue($att['type']) !== null && !vartrue($att['noedit']) && $key != $model->getFieldIdName()) if(vartrue($att['type']) !== null && !vartrue($att['noedit']) && $key != $model->getFieldIdName())
{ {
@@ -3505,12 +3517,11 @@ class e_form
foreach($fdata['fields'] as $key => $att) foreach($fdata['fields'] as $key => $att)
{ {
if($att['tab'] !== $tab) if($tab !== false && varset($att['tab'], 0) !== $tab)
{ {
continue; continue;
} }
// convert aliases - not supported in edit mod // convert aliases - not supported in edit mod
if(vartrue($att['alias']) && !$model->hasData($key)) if(vartrue($att['alias']) && !$model->hasData($key))
{ {
@@ -3538,7 +3549,21 @@ class e_form
$keyName .= '['.$path.']'; $keyName .= '['.$path.']';
} }
} }
// print_a($att)."<br />";
if('hidden' === $att['type'])
{
if(!is_array($att['writeParms'])) parse_str(varset($att['writeParms']), $tmp);
else $tmp = $att['writeParms'];
if(!vartrue($tmp['show']))
{
$hidden_fields[] = $this->renderElement($keyName, $model->getIfPosted($valPath), $att, varset($model_required[$key], array()));
unset($tmp);
continue;
}
unset($tmp);
}
// type null - system (special) fields // type null - system (special) fields
if(vartrue($att['type']) !== null && !vartrue($att['noedit']) && $key != $model->getFieldIdName()) if(vartrue($att['type']) !== null && !vartrue($att['noedit']) && $key != $model->getFieldIdName())
{ {
@@ -3560,19 +3585,6 @@ class e_form
} }
} }
if('hidden' === $att['type'])
{
parse_str(varset($att['writeParms']), $tmp);
if(!vartrue($tmp['show']))
{
$hidden_fields[] = $this->renderElement($keyName, $model->getIfPosted($valPath), $att, varset($model_required[$key], array()));
unset($tmp);
continue;
}
unset($tmp);
}
/* /*
$text .= " $text .= "
<tr> <tr>
@@ -3604,7 +3616,6 @@ class e_form
$text .= " $text .= "
".implode("\n", $hidden_fields)." ".implode("\n", $hidden_fields)."
".$required_help."
".vartrue($fdata['table_post'])." ".vartrue($fdata['table_post'])."
<div class='buttons-bar center'> <div class='buttons-bar center'>
"; ";