From: <pet...@us...> - 2007-05-30 22:53:31
|
Revision: 12391 http://svn.sourceforge.net/jikesrvm/?rev=12391&view=rev Author: peter_donald Date: 2007-05-30 15:53:28 -0700 (Wed, 30 May 2007) Log Message: ----------- Add dimension_name attribute to search_field Modified Paths: -------------- cattrack/trunk/app/models/search_field.rb cattrack/trunk/test/unit/search_field_test.rb Modified: cattrack/trunk/app/models/search_field.rb =================================================================== --- cattrack/trunk/app/models/search_field.rb 2007-05-30 21:53:29 UTC (rev 12390) +++ cattrack/trunk/app/models/search_field.rb 2007-05-30 22:53:28 UTC (rev 12391) @@ -11,12 +11,13 @@ # regarding copyright ownership. # class SearchField - attr_reader :dimension, :name, :key, :options + attr_reader :dimension, :name, :key, :options, :dimension_name def initialize(dimension,name,options = {}) @dimension = dimension @name = name - @key = "#{dimension.name[0,dimension.name.length - 9].tableize.singularize}_#{name}".to_sym + @dimension_name = dimension.name[0,dimension.name.length - 9] + @key = "#{@dimension_name.tableize.singularize}_#{name}".to_sym @options = {:any => true, :size => 4} @options.merge!(options) end Modified: cattrack/trunk/test/unit/search_field_test.rb =================================================================== --- cattrack/trunk/test/unit/search_field_test.rb 2007-05-30 21:53:29 UTC (rev 12390) +++ cattrack/trunk/test/unit/search_field_test.rb 2007-05-30 22:53:28 UTC (rev 12391) @@ -15,6 +15,8 @@ class SearchFieldTest < Test::Unit::TestCase def test_label f = SearchField.new(TestConfigurationDimension,:name, :foo => 'bar') + assert_equal( TestConfigurationDimension, f.dimension ) + assert_equal( 'TestConfiguration', f.dimension_name ) assert_equal( :name, f.name ) assert_equal( :test_configuration_name, f.key ) assert_equal( 3, f.options.size ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |