X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d3700e6201b4b78a70bbb2941572edc985b63c2c..7377cb63939f8743ca31e67ea3965c2b15d20057:/app/models/issue.rb?ds=sidebyside diff --git a/app/models/issue.rb b/app/models/issue.rb index dd068859a..f18581b5f 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -44,10 +44,10 @@ class Issue < ActiveRecord::Base ASSIGNED_ROLES = %w[administrator moderator].freeze validates :assigned_role, :presence => true, :inclusion => ASSIGNED_ROLES - before_validation :set_default_assigned_role before_validation :set_reported_user scope :with_status, ->(issue_status) { where(:status => statuses[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 @@ -92,13 +92,4 @@ class Issue < ActiveRecord::Base reportable.user end end - - def set_default_assigned_role - if assigned_role.blank? - self.assigned_role = case reportable - when Note then "moderator" - else "administrator" - end - end - end end