diff options
author | José Valim <jose.valim@gmail.com> | 2010-03-30 01:04:34 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-03-30 01:32:26 +0200 |
commit | 56bed512f92050f95701eca4f918086a8f1cda1e (patch) | |
tree | 70d36bf93772612bf7ddda398bf1af7a01944b5f /actionpack/lib/action_controller | |
parent | b94c4080e5ba738b76b44d954bd8b13ff13e8688 (diff) | |
download | rails-56bed512f92050f95701eca4f918086a8f1cda1e.tar.gz rails-56bed512f92050f95701eca4f918086a8f1cda1e.tar.bz2 rails-56bed512f92050f95701eca4f918086a8f1cda1e.zip |
Fix dom_id for ActiveRecord [#4296 state:resolved]
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r-- | actionpack/lib/action_controller/record_identifier.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/record_identifier.rb b/actionpack/lib/action_controller/record_identifier.rb index 3f966b1b64..7fdaffe3eb 100644 --- a/actionpack/lib/action_controller/record_identifier.rb +++ b/actionpack/lib/action_controller/record_identifier.rb @@ -76,8 +76,8 @@ module ActionController # method that replaces all characters that are invalid inside DOM ids, with valid ones. You need to # make sure yourself that your dom ids are valid, in case you overwrite this method. def record_key_for_dom_id(record) - return record.id unless record.respond_to?(:to_model) - key = record.to_model.to_key + record = record.to_model if record.respond_to?(:to_model) + key = record.to_key key ? sanitize_dom_id(key.join('_')) : key end |