@@ -40,12 +40,14 @@ class SmerfAnswer < SmerfItem super(parent_id, sort_order_field) @fields = { - 'code' => {'mandatory' => 'Y'}, + 'code' => {'mandatory' => 'Y', 'field_method' => 'code_to_s'}, 'answer' => {'mandatory' => 'Y'}, 'default' => {'mandatory' => 'Y'}, 'sort_order' => {'mandatory' => 'Y'}, 'subquestions' => {'mandatory' => 'N', 'child_items' => 'SmerfQuestion', 'sort_by' => 'sort_order'} } end + + protected end app/models/smerf_answer.rb @@ -33,7 +33,7 @@ class SmerfGroup < SmerfItem # Define group fields @fields = { - 'code' => {'mandatory' => 'Y'}, + 'code' => {'mandatory' => 'Y', 'field_method' => 'code_to_s'}, 'name' => {'mandatory' => 'Y'}, 'questions' => {'mandatory' => 'Y', 'child_items' => 'SmerfQuestion', 'sort_by' => 'sort_order'}, 'description' => {'mandatory' => 'N'} app/models/smerf_group.rb @@ -265,5 +265,14 @@ class SmerfItem remove_instance_variable(:@unique_code_check) remove_instance_variable(:@fields) end + + protected + + # Store codes as a string, if we don't then numeric codes + # will have problems as we do comparisons with responsed pulled + # directly from the http request where all codes are strings. + def code_to_s + @code = @code.to_s + end end app/models/smerf_item.rb @@ -69,7 +69,7 @@ class SmerfQuestion < SmerfItem super(parent_id, sort_order_field) @fields = { - 'code' => {'mandatory' => 'Y'}, + 'code' => {'mandatory' => 'Y', 'field_method' => 'code_to_s'}, 'type' => {'mandatory' => 'Y', 'field_method' => 'check_question_type'}, 'question' => {'mandatory' => 'N'}, 'sort_order' => {'mandatory' => 'Y'}, app/models/smerf_question.rb 529697aa0c23d73a17fa737c2e2964a36d6b6875 Etienne van Tonder etiennevt@gmail.com http://github.com/springbok/smerf/commit/9be23171633eaa8fbb4723a03af48cb72c9797cd 9be23171633eaa8fbb4723a03af48cb72c9797cd 2009-05-07T20:21:14-07:00 2009-05-07T20:21:14-07:00 Bug fix: As per the bug reported by bgoodwin. SMERF now correctly handles numeric question codes. Previously if a numeric question code was used the validation functions did not work correctly as it was trying to access the responses hash extracted directly from the HTTP request using a numeric key when all the keys in the responses hash are strings. SMERF will now convert numeric codes to a string before saving to the DB. b487b3f69154690ab8ddda3b6ff0ef4914e38c9b Etienne van Tonder etiennevt@gmail.com