| Index: trunk/extensions/SemanticForms/includes/SF_FormField.php |
| — | — | @@ -144,12 +144,12 @@ |
| 145 | 145 | |
| 146 | 146 | END; |
| 147 | 147 | global $sfgFormPrinter; |
| 148 | | - if ( is_null( $template_field->field_type_id ) ) { |
| | 148 | + if ( is_null( $template_field->property_type ) ) { |
| 149 | 149 | $default_input_type = null; |
| 150 | 150 | $possible_input_types = $sfgFormPrinter->getAllInputTypes(); |
| 151 | 151 | } else { |
| 152 | | - $default_input_type = $sfgFormPrinter->getDefaultInputType( $template_field->is_list, $template_field->field_type_id ); |
| 153 | | - $possible_input_types = $sfgFormPrinter->getPossibleInputTypes( $template_field->is_list, $template_field->field_type_id ); |
| | 152 | + $default_input_type = $sfgFormPrinter->getDefaultInputType( $template_field->is_list, $template_field->property_type ); |
| | 153 | + $possible_input_types = $sfgFormPrinter->getPossibleInputTypes( $template_field->is_list, $template_field->property_type ); |
| 154 | 154 | } |
| 155 | 155 | $text .= $this->inputTypeDropdownHTML( $field_form_text, $default_input_type, $possible_input_types, $template_field->input_type ); |
| 156 | 156 | |
| — | — | @@ -252,7 +252,7 @@ |
| 253 | 253 | // type with 'autocomplete' specified, set the necessary |
| 254 | 254 | // parameters. |
| 255 | 255 | if ( ! array_key_exists( 'autocompletion source', $other_args ) ) { |
| 256 | | - if ( $this->template_field->field_type_id == '_wpg' ) { |
| | 256 | + if ( $this->template_field->property_type == '_wpg' ) { |
| 257 | 257 | $other_args['autocompletion source'] = $this->template_field->semantic_property; |
| 258 | 258 | $other_args['autocomplete field type'] = 'relation'; |
| 259 | 259 | } elseif ( array_key_exists( 'autocomplete', $other_args ) || array_key_exists( 'remote autocompletion', $other_args ) ) { |