X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/d1d4f8192da5a266cddb17bb8970b2b04387888c..c7bc13668b78afde72e9b8f6644b001799e84eb9:/app/models/issue.rb diff --git a/app/models/issue.rb b/app/models/issue.rb index a9e2d2405..604b73d98 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -14,11 +14,11 @@ class Issue < ActiveRecord::Base scope :with_status, -> (issue_status) { where(:status => statuses[issue_status])} def read_reports - resolved_at.present? ? reports.where("created_at < ?", resolved_at) : nil + resolved_at.present? ? reports.where("updated_at < ?", resolved_at) : nil end def unread_reports - resolved_at.present? ? reports.where("created_at >= ?", resolved_at) : reports + resolved_at.present? ? reports.where("updated_at >= ?", resolved_at) : reports end include AASM @@ -40,6 +40,7 @@ class Issue < ActiveRecord::Base event :reopen do transitions :from => :resolved, :to => :open + transitions :from => :ignored, :to => :open end end