mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-05 14:17:49 +02:00
Code Issues Releases Wiki Activity

Admin-UI Notice removal and option to set default for form elements. (writeParms="default=xxx")

Browse Source
This commit is contained in:
Cameron
2015-01-05 14:05:53 -08:00
parent 471df03df1
commit 72e05b933c
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
e107_handlers/form_handler.php
View File

@@ -865,6 +865,7 @@ class e_form
$type = varset($options['type']) ? trim($options['type']) : "date"; // OR 'datetime' $type = varset($options['type']) ? trim($options['type']) : "date"; // OR 'datetime'
$dateFormat = varset($options['format']) ? trim($options['format']) :e107::getPref('inputdate', '%Y-%m-%d'); $dateFormat = varset($options['format']) ? trim($options['format']) :e107::getPref('inputdate', '%Y-%m-%d');
$ampm = (preg_match("/%l|%I|%p|%P/",$dateFormat)) ? 'true' : 'false'; $ampm = (preg_match("/%l|%I|%p|%P/",$dateFormat)) ? 'true' : 'false';
$value = null;
if($type == 'datetime' && !varset($options['format'])) if($type == 'datetime' && !varset($options['format']))
{ {
@@ -3471,6 +3472,11 @@ class e_form
$tp = e107::getParser(); $tp = e107::getParser();
if(is_string($parms)) parse_str($parms, $parms); if(is_string($parms)) parse_str($parms, $parms);
if(empty($value) && !empty($parms['default'])) // Allow writeParms to set default value.
{
$value = $parms['default'];
}
// Two modes of read-only. 1 = read-only, but only when there is a value, 2 = read-only regardless. // Two modes of read-only. 1 = read-only, but only when there is a value, 2 = read-only regardless.
if(vartrue($attributes['readonly']) && (vartrue($value) || vartrue($attributes['readonly'])===2)) // quick fix (maybe 'noedit'=>'readonly'?) if(vartrue($attributes['readonly']) && (vartrue($value) || vartrue($attributes['readonly'])===2)) // quick fix (maybe 'noedit'=>'readonly'?)
@@ -4153,13 +4159,13 @@ class e_form
} }
} }
if(!is_array($att['writeParms'])) if(!empty($att['writeParms']) && !is_array($att['writeParms']))
{ {
parse_str(varset($att['writeParms']), $writeParms); parse_str(varset($att['writeParms']), $writeParms);
} }
else else
{ {
$writeParms = $att['writeParms']; $writeParms = varset($att['writeParms']);
} }
@@ -4217,7 +4223,7 @@ class e_form
$leftCell = $required."<span{$required_class}>".defset(vartrue($att['title']), vartrue($att['title']))."</span>".$label; $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}"; $rightCell = $this->renderElement($keyName, $model->getIfPosted($valPath), $att, varset($model_required[$key], array()), $model->getId())." {$help}";
if(vartrue($att['type']) == 'bbarea' || $writeParms['nolabel'] == true) if(vartrue($att['type']) == 'bbarea' || varset($writeParms['nolabel']) == true)
{ {
$text .= " $text .= "
<tr><td colspan='2'>"; <tr><td colspan='2'>";
@@ -4368,7 +4374,7 @@ class e_form
<tbody> <tbody>
"; ";
*/ */
$text = '';
// required fields - model definition // required fields - model definition
$model_required = $model->getValidationRules(); $model_required = $model->getValidationRules();