diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-03-31 07:47:58 -0700 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-03-31 07:47:58 -0700 |
| commit | 824fa10f4d1306cc1e310a7d5de7e95cfb07d6f8 (patch) | |
| tree | 1967c2a945d6e131d467fb4f0178a0f60e01ae8a /actionpack/lib/action_controller/record_identifier.rb | |
| parent | 1ed1652bef981d9402797b6cb9f0920a40eea21a (diff) | |
| parent | db28d407f76a790a31e27bf51560e23425dd6944 (diff) | |
| download | rails-824fa10f4d1306cc1e310a7d5de7e95cfb07d6f8.tar.gz rails-824fa10f4d1306cc1e310a7d5de7e95cfb07d6f8.tar.bz2 rails-824fa10f4d1306cc1e310a7d5de7e95cfb07d6f8.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'actionpack/lib/action_controller/record_identifier.rb')
| -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 |