cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Validate the assigned role, and remove the :type activrecord enum

Browse source
This commit is contained in:
Andy Allan 2017-12-06 17:00:35 +00:00
parent 0df788d742
commit cbe707b33e
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/models/issue.rb
View file

@ -37,13 +37,13 @@ class Issue < ActiveRecord::Base
validates :reportable_id, :uniqueness => { :scope => [:reportable_type] } validates :reportable_id, :uniqueness => { :scope => [:reportable_type] }
validates :reported_user_id, :presence => true validates :reported_user_id, :presence => true
validates :assigned_role, :presence => true, :inclusion => %w[administrator moderator]
before_validation :set_default_assigned_role before_validation :set_default_assigned_role
before_validation :set_reported_user before_validation :set_reported_user
# Check if more statuses are needed # Check if more statuses are needed
enum :status => %w[open ignored resolved] enum :status => %w[open ignored resolved]
enum :type => %w[administrator moderator]
scope :with_status, ->(issue_status) { where(:status => statuses[issue_status]) } scope :with_status, ->(issue_status) { where(:status => statuses[issue_status]) }