X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/619ac4c5b2fbdbc610007376ee11e3921e475520..088a78d83c26333fa08eee8c4bb4620a5e7ff1af:/app/models/issue.rb diff --git a/app/models/issue.rb b/app/models/issue.rb index 207af63c4..a3f82ee40 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -50,11 +50,11 @@ class Issue < ApplicationRecord scope :visible_to, ->(user) { where(:assigned_role => user.roles.map(&:role)) } def read_reports - resolved_at.present? ? reports.where("updated_at < ?", resolved_at) : nil + resolved_at.present? ? reports.where(:updated_at => ...resolved_at) : nil end def unread_reports - resolved_at.present? ? reports.where("updated_at >= ?", resolved_at) : reports + resolved_at.present? ? reports.where(:updated_at => resolved_at..) : reports end include AASM @@ -70,7 +70,7 @@ class Issue < ApplicationRecord event :resolve do transitions :from => :open, :to => :resolved after do - self.resolved_at = Time.now.getutc + self.resolved_at = Time.now.utc end end