X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8dc8479e12b50878ca6b476a4dd72fe1da1f24ad..424b6ef1cf760c4a3e27ac1e6f612ae42a9cd493:/app/models/issue.rb?ds=sidebyside diff --git a/app/models/issue.rb b/app/models/issue.rb index 83923f242..d13f297a9 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -5,7 +5,7 @@ # id :integer not null, primary key # reportable_type :string not null # reportable_id :integer not null -# reported_user_id :integer not null +# reported_user_id :integer # status :integer # assigned_role :enum not null # resolved_at :datetime @@ -36,7 +36,6 @@ class Issue < ActiveRecord::Base has_many :comments, :class_name => "IssueComment", :dependent => :destroy validates :reportable_id, :uniqueness => { :scope => [:reportable_type] } - validates :reported_user_id, :presence => true ASSIGNED_ROLES = %w[administrator moderator].freeze validates :assigned_role, :presence => true, :inclusion => ASSIGNED_ROLES @@ -94,7 +93,7 @@ class Issue < ActiveRecord::Base end def set_default_assigned_role - role = %w[Changeset Note].include?(reportable.class.name) ? "moderator" : "administrator" + role = %w[Note].include?(reportable.class.name) ? "moderator" : "administrator" self.assigned_role = role if assigned_role.blank? end end