X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/2f9291ba5764fe104264ae7e3b6a361e11212e8b..7996b843807aa08ab5f79fc718212109f72f0faa:/app/models/issue.rb?ds=sidebyside diff --git a/app/models/issue.rb b/app/models/issue.rb index f18581b5f..c94fe56a7 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -30,9 +30,9 @@ # issues_updated_by_fkey (updated_by => users.id) # -class Issue < ActiveRecord::Base +class Issue < ApplicationRecord belongs_to :reportable, :polymorphic => true - belongs_to :reported_user, :class_name => "User", :foreign_key => :reported_user_id + 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 @@ -46,7 +46,7 @@ class Issue < ActiveRecord::Base 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