@@ -18,7 +18,7 @@ class Streamlined::Column::Association < Streamlined::Column::Base attr_accessor :options_for_select attr_with_default :quick_add, 'true' delegates :name, :class_name, :to => :underlying_association - delegates :belongs_to?, :has_many?, :has_and_belongs_to_many?, :to => :underlying_association + delegates :belongs_to?, :has_many?, :has_and_belongs_to_many?, :primary_key_name, :to => :underlying_association def initialize(assoc, parent_model, edit, show) @underlying_association = assoc @@ -130,7 +130,7 @@ class Streamlined::Column::Association < Streamlined::Column::Base choices = options_for_select ? custom_options_for_select(view) : standard_options_for_select choices.unshift(unassigned_option) if column_can_be_unassigned?(parent_model, name) selected_choice = item.send(name).id if item.send(name) - result = view.select(model_underscore, name_as_id, choices, { :selected => selected_choice }, html_options) + result = view.select(model_underscore, primary_key_name, choices, { :selected => selected_choice }, html_options) result += render_quick_add(view) if should_render_quick_add?(view) end append_help(result) lib/streamlined/column/association.rb @@ -9,6 +9,7 @@ describe "Streamlined::Column::Association" do @ar_assoc = flexmock(:name => 'some_name', :class_name => 'SomeClass') @model = flexmock(:name => 'model') @association = Association.new(@ar_assoc, @model, :inset_table, :count) + @association.stubs(:primary_key_name).returns("some_name_id") end # begin stub classes test/unit/streamlined/column/association_test.rb a540467639c55f2f8069a0d39ba36850879fe412 matthew matthew@4f249914-c612-0410-8deb-f4485a9d85ab http://github.com/relevance/streamlined/commit/481b03556c0b9e4f1014b7ab77d050758591b558 481b03556c0b9e4f1014b7ab77d050758591b558 2008-07-16T11:14:25-07:00 2008-07-16T11:14:25-07:00 fixed bug in association.rb where invalid table key could potentially be used fa1de6a5adf28a28de8af26ae5cd12fe44767fa7 matthew matthew@4f249914-c612-0410-8deb-f4485a9d85ab