diff options
| author | Scott Holden <sholde4@gmail.com> | 2012-10-24 21:54:15 -0700 |
|---|---|---|
| committer | Scott Holden <sholde4@gmail.com> | 2012-10-24 21:54:15 -0700 |
| commit | 2335d7b9cf577fb03ed4efc660b8e3e706c1c01b (patch) | |
| tree | 480a8a150a252d1b27d625105ebede0ae60d8264 | |
| parent | 5add5f760ebd87e9318f13d3f2ae4e4a4ddbe3ae (diff) | |
| download | gitlab-ce-2335d7b9cf577fb03ed4efc660b8e3e706c1c01b.tar.gz | |
Fix broken Note scopes with lambdas, 4.0 compat
Without lambdas, Date.today will be evaluated in the class body.
For it to have a running scope of last week etc, it will need to
be evaluated each time the scope is called.
In Rails 4.0, lambdas will be required for all scopes, so not a bad
idea to go ahead and change them all now.
| -rw-r--r-- | app/models/note.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/models/note.rb b/app/models/note.rb index e2f4a89d7d6..d7701c3815b 100644 --- a/app/models/note.rb +++ b/app/models/note.rb @@ -23,13 +23,13 @@ class Note < ActiveRecord::Base mount_uploader :attachment, AttachmentUploader # Scopes - scope :common, where(noteable_id: nil) - scope :today, where("created_at >= :date", date: Date.today) - scope :last_week, where("created_at >= :date", date: (Date.today - 7.days)) + scope :common, ->{ where(noteable_id: nil) } + scope :today, ->{ where("created_at >= :date", date: Date.today) } + scope :last_week, ->{ where("created_at >= :date", date: (Date.today - 7.days)) } scope :since, ->(day) { where("created_at >= :date", date: (day)) } - scope :fresh, order("created_at ASC, id ASC") - scope :inc_author_project, includes(:project, :author) - scope :inc_author, includes(:author) + scope :fresh, ->{ order("created_at ASC, id ASC") } + scope :inc_author_project, ->{ includes(:project, :author) } + scope :inc_author, ->{ includes(:author) } def self.create_status_change_note(noteable, author, status) create({ |
