Merge remote-tracking branch 'upstream/pull/5387'

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

diff --git a/app/models/issue.rb b/app/models/issue.rb
index c94fe56a7d47b30c33f9ac3d51cfe6c1bee81afd..a3f82ee40b11881bddf5d5226404f8209668f614 100644 (file)
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -32,9 +32,9 @@
 
 class Issue < ApplicationRecord
   belongs_to :reportable, :polymorphic => true
 
 class Issue < ApplicationRecord
   belongs_to :reportable, :polymorphic => true

-  belongs_to :reported_user, :class_name => "User"
-  belongs_to :user_resolved, :class_name => "User", :foreign_key => :resolved_by
-  belongs_to :user_updated, :class_name => "User", :foreign_key => :updated_by
+  belongs_to :reported_user, :class_name => "User", :optional => true
+  belongs_to :user_resolved, :class_name => "User", :foreign_key => :resolved_by, :optional => true
+  belongs_to :user_updated, :class_name => "User", :foreign_key => :updated_by, :optional => true

 
   has_many :reports, :dependent => :destroy
   has_many :comments, :class_name => "IssueComment", :dependent => :destroy
 
   has_many :reports, :dependent => :destroy
   has_many :comments, :class_name => "IssueComment", :dependent => :destroy


@@ -50,11 +50,11 @@ class Issue < ApplicationRecord
   scope :visible_to, ->(user) { where(:assigned_role => user.roles.map(&:role)) }
 
   def read_reports
   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
   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
   end
 
   include AASM


@@ -70,7 +70,7 @@ class Issue < ApplicationRecord
     event :resolve do
       transitions :from => :open, :to => :resolved
       after do
     event :resolve do
       transitions :from => :open, :to => :resolved
       after do

-        self.resolved_at = Time.now.getutc
+        self.resolved_at = Time.now.utc

       end
     end
 
       end
     end