Issue reopens on Reports coming in after instance update

[rails.git] / app / models / issue.rb

diff --git a/app/models/issue.rb b/app/models/issue.rb
index a9e2d240568e4c515be2ca5aaef64d8cb4e9f389..604b73d986ef69b9bda2e5897c0a7e3d0fcb282e 100644 (file)
--- 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