consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dashboard' into rebase_consul_master

Browse Source
This commit is contained in:
Juan Salvador Pérez García
2018-09-27 09:18:27 +02:00
committed by GitHub
parent 2a0664d473 177eedf8e4
commit 488e7e081f
72 changed files with 1825 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/models/proposal.rb
View File

@@ -39,12 +39,12 @@ class Proposal < ActiveRecord::Base
validates :question, presence: true
validates :summary, presence: true
validates :author, presence: true
validates :responsible_name, presence: true
validates :responsible_name, presence: true, unless: :skip_user_verification?
validates :title, length: { in: 4..Proposal.title_max_length }
validates :description, length: { maximum: Proposal.description_max_length }
validates :question, length: { in: 10..Proposal.question_max_length }
validates :responsible_name, length: { in: 6..Proposal.responsible_name_max_length }
validates :responsible_name, length: { in: 6..Proposal.responsible_name_max_length }, unless: :skip_user_verification?
validates :retired_reason, inclusion: { in: RETIRE_OPTIONS, allow_nil: true }
validates :terms_of_service, acceptance: { allow_nil: false }, on: :create
@@ -232,6 +232,10 @@ class Proposal < ActiveRecord::Base
return orders
end
def skip_user_verification?
Setting["feature.user.skip_verification"].present?
end
protected
def set_responsible_name