X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7dbf8d83369cb73929080c4ba23fdd7dcd0184df..71c5cb21c5d3255899a405599261b3bb182ba321:/app/models/issue.rb diff --git a/app/models/issue.rb b/app/models/issue.rb index 27c0a7cc9..f18581b5f 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -6,7 +6,7 @@ # reportable_type :string not null # reportable_id :integer not null # reported_user_id :integer -# status :enum default(NULL), not null +# status :enum default("open"), not null # assigned_role :enum not null # resolved_at :datetime # resolved_by :integer @@ -17,8 +17,10 @@ # # Indexes # +# index_issues_on_assigned_role (assigned_role) # index_issues_on_reportable_type_and_reportable_id (reportable_type,reportable_id) # index_issues_on_reported_user_id (reported_user_id) +# index_issues_on_status (status) # index_issues_on_updated_by (updated_by) # # Foreign Keys @@ -42,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 @@ -90,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