aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
diff options
context:
space:
mode:
Diffstat (limited to 'activerecord')
-rw-r--r--activerecord/CHANGELOG.md1
-rw-r--r--activerecord/lib/active_record/base.rb7
2 files changed, 8 insertions, 0 deletions
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index f798b03ea1..d39418cd87 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,6 @@
## Rails 3.2.0 (unreleased) ##
+* Added ActiveRecord::Base#last_modified to work with the new fresh_when/stale? conditional get methods from Action Pack *DHH*
* Implemented ActiveRecord::Relation#pluck method
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 76aa121ade..bae2dc738e 100644
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -1702,6 +1702,13 @@ MSG
end
end
+ # By default returns the value of the updated_at attribute, but can be overwritten to
+ # provide another indicator of when this record was last updated. This is used by
+ # ActionControllers conditional get fresh_when/stale? methods.
+ def last_modified
+ self[:updated_at]
+ end
+
def quoted_id #:nodoc:
quote_value(id, column_for_attribute(self.class.primary_key))
end