X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d1d4f8192da5a266cddb17bb8970b2b04387888c..965f32d545d7c44ad7b36264b818b930a50d8901:/app/models/issue.rb diff --git a/app/models/issue.rb b/app/models/issue.rb index a9e2d2405..6de535e81 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -10,15 +10,16 @@ class Issue < ActiveRecord::Base # Check if more statuses are needed enum status: %w( open ignored resolved ) + enum type: %w( administrator moderator ) 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,8 +41,8 @@ class Issue < ActiveRecord::Base event :reopen do transitions :from => :resolved, :to => :open + transitions :from => :ignored, :to => :open end end - end