@@ -12,7 +12,7 @@ discard block |
||
| 12 | 12 | $ret = ''; |
| 13 | 13 | if (method_exists($model, $field_name)) { |
| 14 | 14 | $ret = $model->$field_name(); |
| 15 | - }elseif (property_exists($model, $field_name)) { |
|
| 15 | + } elseif (property_exists($model, $field_name)) { |
|
| 16 | 16 | $ret = $model->$field_name; |
| 17 | 17 | } |
| 18 | 18 | |
@@ -93,31 +93,23 @@ discard block |
||
| 93 | 93 | $ret = null; |
| 94 | 94 | if ($field->isAutoIncremented()) { |
| 95 | 95 | $ret = Form::hidden($field->name(), $field_value); |
| 96 | - } |
|
| 97 | - elseif ($field->type()->isBoolean()) { |
|
| 96 | + } elseif ($field->type()->isBoolean()) { |
|
| 98 | 97 | $option_list = $attributes['values'] ?? [0 => 0, 1 => 1]; |
| 99 | 98 | $ret = Form::select($field->name(), $option_list, $field_value, $attributes); // |
| 100 | - } |
|
| 101 | - elseif ($field->type()->isInteger()) { |
|
| 99 | + } elseif ($field->type()->isInteger()) { |
|
| 102 | 100 | $ret = Form::input($field->name(), $field_value, $attributes, $errors); |
| 103 | - } |
|
| 104 | - elseif ($field->type()->isYear()) { |
|
| 101 | + } elseif ($field->type()->isYear()) { |
|
| 105 | 102 | $attributes['size'] = $attributes['maxlength'] = 4; |
| 106 | 103 | $ret = Form::input($field->name(), $field_value, $attributes, $errors); |
| 107 | - } |
|
| 108 | - elseif ($field->type()->isDate()) { |
|
| 104 | + } elseif ($field->type()->isDate()) { |
|
| 109 | 105 | $ret = Form::date($field->name(), $field_value, $attributes, $errors); |
| 110 | - } |
|
| 111 | - elseif ($field->type()->isTime()) { |
|
| 106 | + } elseif ($field->type()->isTime()) { |
|
| 112 | 107 | $ret = Form::time($field->name(), $field_value, $attributes, $errors); |
| 113 | - } |
|
| 114 | - elseif ($field->type()->isDatetime()) { |
|
| 108 | + } elseif ($field->type()->isDatetime()) { |
|
| 115 | 109 | $ret = Form::datetime($field->name(), $field_value, $attributes, $errors); |
| 116 | - } |
|
| 117 | - elseif ($field->type()->isText()) { |
|
| 110 | + } elseif ($field->type()->isText()) { |
|
| 118 | 111 | $ret = Form::textarea($field->name(), $field_value, $attributes, $errors); |
| 119 | - } |
|
| 120 | - elseif ($field->type()->isEnum()) { |
|
| 112 | + } elseif ($field->type()->isEnum()) { |
|
| 121 | 113 | $enum_values = []; |
| 122 | 114 | foreach ($field->type()->getEnumValues() as $e_val) { |
| 123 | 115 | $enum_values[$e_val] = $e_val; |
@@ -125,14 +117,13 @@ discard block |
||
| 125 | 117 | |
| 126 | 118 | $selected = $attributes['value'] ?? $field_value ?? ''; |
| 127 | 119 | $ret = Form::select($field->name(), $enum_values, $selected, $attributes); // |
| 128 | - } |
|
| 129 | - elseif ($field->type()->isString()) { |
|
| 120 | + } elseif ($field->type()->isString()) { |
|
| 130 | 121 | $max_length = $field->type()->getLength(); |
| 131 | 122 | $attributes['size'] = $attributes['maxlength'] = $max_length; |
| 132 | 123 | $ret = Form::input($field->name(), $field_value, $attributes, $errors); |
| 124 | + } else { |
|
| 125 | + $ret = Form::input($field->name(), $field_value, $attributes, $errors); |
|
| 133 | 126 | } |
| 134 | - else |
|
| 135 | - $ret = Form::input($field->name(), $field_value, $attributes, $errors); |
|
| 136 | 127 | |
| 137 | 128 | return $ret; |
| 138 | 129 | } |