X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/a41d500b9f65ec9f4e848effd38dc1ae117e7594..c0bdcd53d2c04638a7490400e2abb43c88fe99ad:/app/models/issue.rb diff --git a/app/models/issue.rb b/app/models/issue.rb index 14c5f8231..a3f82ee40 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -32,9 +32,9 @@ class Issue < ApplicationRecord belongs_to :reportable, :polymorphic => true - belongs_to :reported_user, :class_name => "User", :foreign_key => :reported_user_id - 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 @@ -46,15 +46,15 @@ class Issue < ApplicationRecord before_validation :set_reported_user - scope :with_status, ->(issue_status) { where(:status => statuses[issue_status]) } + scope :with_status, ->(issue_status) { where(:status => issue_status) } 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