Index: trunk/extensions/SemanticForms/includes/SF_FormPrinter.inc |
— | — | @@ -547,7 +547,8 @@ |
548 | 548 | $possible_values = array_map('trim', explode(',', $sub_components[1])); |
549 | 549 | $possible_values = array_map('htmlspecialchars_decode', $possible_values); |
550 | 550 | } elseif ($sub_components[0] == 'values from category') { |
551 | | - $possible_values = SFUtils::getAllPagesForCategory($sub_components[1], 10); |
| 551 | + $category_name = ucfirst($sub_components[1]); |
| 552 | + $possible_values = SFUtils::getAllPagesForCategory($category_name, 10); |
552 | 553 | } elseif ($sub_components[0] == 'values from concept') { |
553 | 554 | $possible_values = SFUtils::getAllPagesForConcept($sub_components[1]); |
554 | 555 | } elseif ($sub_components[0] == 'property') { |
— | — | @@ -895,7 +896,10 @@ |
896 | 897 | } elseif (($form_field->template_field->is_list && $form_field->template_field->field_type == 'enumeration' && $input_type != 'listbox') || ($input_type == 'checkboxes')) { |
897 | 898 | $sfgJSValidationCalls[] = "validate_mandatory_checkboxes('$input_id', '$info_id')"; |
898 | 899 | } elseif ($input_type == 'radiobutton') { |
899 | | - $sfgJSValidationCalls[] = "validate_mandatory_radiobutton('$input_id', '$info_id')"; |
| 900 | + // only add this if there's a "None" option |
| 901 | + if (is_null($default_value)) { |
| 902 | + $sfgJSValidationCalls[] = "validate_mandatory_radiobutton('$input_id', '$info_id')"; |
| 903 | + } |
900 | 904 | } else { |
901 | 905 | $sfgJSValidationCalls[] = "validate_mandatory_field('$input_id', '$info_id')"; |
902 | 906 | } |