FIX Forces conversion str to boolean

This commit is contained in:
Jasder 2020-12-04 17:13:58 +08:00
parent 7c0c90b9bf
commit aaf3661fd6
2 changed files with 18 additions and 14 deletions

View File

@ -14,4 +14,8 @@ class ApplicationService
def strip(str) def strip(str)
str.to_s.strip.presence str.to_s.strip.presence
end end
end
def str_to_boolean str
ActiveModel::Type::Boolean.new.cast str
end
end

View File

@ -91,37 +91,37 @@ module ProtectedBranches
end end
def enable_status_check_params def enable_status_check_params
params[:enable_status_check] || false str_to_boolean(params[:enable_status_check] || false)
end end
def enable_approvals_whitelist_params def enable_approvals_whitelist_params
params[:enable_approvals_whitelist] || false str_to_boolean(params[:enable_approvals_whitelist] || false)
end end
def block_on_rejected_reviews_params def block_on_rejected_reviews_params
params[:block_on_rejected_reviews] || false str_to_boolean(params[:block_on_rejected_reviews] || false)
end end
def dismiss_stale_approvals_params def dismiss_stale_approvals_params
params[:dismiss_stale_approvals] || false str_to_boolean(params[:dismiss_stale_approvals] || false)
end end
def require_signed_commits_params def require_signed_commits_params
params[:require_signed_commits] || false str_to_boolean(params[:require_signed_commits] || false)
end end
def block_on_outdated_branch_params def block_on_outdated_branch_params
params[:block_on_outdated_branch] || false str_to_boolean(params[:block_on_outdated_branch] || false)
end end
def can_push_params def can_push_params
return false if !can_push? return false if !can_push?
return true if enable_whitelist? return true if enable_whitelist?
params[:enable_push] str_to_boolean(params[:enable_push])
end end
def enable_whitelist_params def enable_whitelist_params
return false if !can_push? return false if !can_push?
params[:enable_push_whitelist] str_to_boolean(params[:enable_push_whitelist])
end end
def whitelist_user_i_ds_params def whitelist_user_i_ds_params
@ -134,7 +134,7 @@ module ProtectedBranches
end end
def enable_merge_whitelist_params def enable_merge_whitelist_params
params[:enable_merge_whitelist] || false str_to_boolean(params[:enable_merge_whitelist] || false)
end end
def merge_whitelist_user_i_ds_params def merge_whitelist_user_i_ds_params
@ -195,19 +195,19 @@ module ProtectedBranches
end end
def can_push? def can_push?
params[:enable_push] === true str_to_boolean(params[:enable_push]) === true
end end
def enable_whitelist? def enable_whitelist?
params[:enable_push_whitelist] === true str_to_boolean(params[:enable_push_whitelist]) === true
end end
def enable_merge_whitelist? def enable_merge_whitelist?
params[:enable_merge_whitelist] === true str_to_boolean(params[:enable_merge_whitelist]) === true
end end
def enable_approvals_whitelist? def enable_approvals_whitelist?
params[:enable_approvals_whitelist] === true str_to_boolean(params[:enable_approvals_whitelist]) === true
end end
def filter_empty_element(array) def filter_empty_element(array)