[#282] Make safe_attributes work with symbol keys

0320517d · Gregor Schmidt · b5b36844 · 0320517d · 0320517d
Commit 0320517d authored Mar 14, 2011 by Gregor Schmidt
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 1 deletion

safe_attributes.rb lib/redmine/safe_attributes.rb +1 -1

safe_attributes_test.rb test/unit/lib/redmine/safe_attributes_test.rb +7 -0

No files found.
--- a/lib/redmine/safe_attributes.rb
+++ b/lib/redmine/safe_attributes.rb
@@ -67,7 +67,7 @@ module Redmine
    #   # => {'title' => 'My book'}
    def delete_unsafe_attributes(attrs, user=User.current)
      safe = safe_attribute_names(user)
-      attrs.dup.delete_if {|k,v| !safe.include?(k)}
+      attrs.dup.delete_if {|k,v| !safe.include?(k.to_s)}
    end
    
    # Sets attributes from attrs that are safe

--- a/test/unit/lib/redmine/safe_attributes_test.rb
+++ b/test/unit/lib/redmine/safe_attributes_test.rb
@@ -90,6 +90,13 @@ class Redmine::SafeAttributesTest < ActiveSupport::TestCase
    assert_equal 'jsmith', p.login
  end

+  def test_with_indifferent_access
+    p = Person.new
+    p.safe_attributes = {'firstname' => 'Jack', :lastname => 'Miller'}
+    assert_equal 'Jack', p.firstname
+    assert_equal 'Miller', p.lastname
+  end
+
  def test_use_safe_attributes_in_subclasses
    b = Book.new
    p = PublishedBook.new