mirror of
https://github.com/e107inc/e107.git
synced 2025-08-19 21:02:09 +02:00
Fixes #976 - Submit news status now updates after being approved. Form-handler 'hidden fields' type now correctly rendered with the form.
This commit is contained in:
@@ -4021,9 +4021,9 @@ class e_form
|
||||
break;
|
||||
|
||||
case 'hidden':
|
||||
|
||||
$value = (isset($parms['value'])) ? $parms['value'] : $value;
|
||||
$ret = (vartrue($parms['show']) ? ($value ? $value : varset($parms['empty'], $value)) : '');
|
||||
//echo "<br />key=".$key."<br />value=".$value;
|
||||
$ret = $ret.$this->hidden($key, $value);
|
||||
break;
|
||||
|
||||
@@ -4039,6 +4039,10 @@ class e_form
|
||||
$ret = vartrue($eloptions['pre']).$this->selectbox($key, $options, $value, $eloptions).vartrue($eloptions['post']);
|
||||
break;
|
||||
|
||||
case null:
|
||||
// Possibly used in db but should not be submitted in form. @see news_extended.
|
||||
break;
|
||||
|
||||
default:// No LAN necessary, debug only.
|
||||
$ret = (ADMIN) ? "<span class='alert alert-error'>".LAN_ERROR." Unknown 'type' : ".$attributes['type'] ."</span>" : $value;
|
||||
break;
|
||||
@@ -4338,6 +4342,8 @@ class e_form
|
||||
$model_required = $model->getValidationRules();
|
||||
$required_help = false;
|
||||
$hidden_fields = array();
|
||||
|
||||
|
||||
foreach($fdata['fields'] as $key => $att)
|
||||
{
|
||||
if($tab !== false && varset($att['tab'], 0) !== $tab)
|
||||
@@ -4351,7 +4357,7 @@ class e_form
|
||||
$key = $att['field'];
|
||||
}
|
||||
|
||||
if($key == 'checkboxes' || $key == 'options')
|
||||
if($key == 'checkboxes' || $key == 'options' || ($att['type'] === null))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
@@ -4389,6 +4395,8 @@ class e_form
|
||||
|
||||
if(!vartrue($writeParms['show']))
|
||||
{
|
||||
$hidden_fields[] = $this->renderElement($keyName, $model->getIfPosted($valPath), $att, varset($model_required[$key], array()));
|
||||
|
||||
continue;
|
||||
}
|
||||
unset($tmp);
|
||||
@@ -4415,7 +4423,7 @@ class e_form
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
/*
|
||||
if('hidden' === $att['type'])
|
||||
{
|
||||
parse_str(varset($att['writeParms']), $tmp);
|
||||
@@ -4427,12 +4435,8 @@ class e_form
|
||||
}
|
||||
unset($tmp);
|
||||
}
|
||||
|
||||
*
|
||||
*
|
||||
*
|
||||
*
|
||||
*/
|
||||
*/
|
||||
|
||||
|
||||
$leftCell = $required."<span{$required_class}>".defset(vartrue($att['title']), vartrue($att['title']))."</span>".$label;
|
||||
$rightCell = $this->renderElement($keyName, $model->getIfPosted($valPath), $att, varset($model_required[$key], array()), $model->getId())." {$help}";
|
||||
@@ -4487,7 +4491,11 @@ class e_form
|
||||
|
||||
$text .= "
|
||||
</tbody>
|
||||
</table></fieldset>";
|
||||
</table>";
|
||||
|
||||
$text .= implode("\n", $hidden_fields);
|
||||
|
||||
$text .= "</fieldset>";
|
||||
|
||||
$text .= vartrue($fdata['fieldset_post']);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user