Trustie
/
forgeplus
forked from Gitlink/forgeplus
21
0
Fork 5
Code Issues Pull Requests Projects Releases Wiki Activity

FIX create protected branch params

This commit is contained in:
Jasder 2020-12-04 18:15:48 +08:00
parent 539b4a10a0
commit 4c980b5774
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/services/protected_branches/base_service.rb
View File

@ -148,7 +148,7 @@ module ProtectedBranches
def approvals_whitelist_user_i_ds_params
return [] if !enable_approvals_whitelist?
user_ids(get_approvals_whitelist_username)
user_ids(get_approvals_whitelist_usernames)
end
def approvals_whitelist_team_i_ds_params
@ -177,9 +177,9 @@ module ProtectedBranches
filter_empty_element Array(params[:merge_whitelist_usernames])
end
def get_approvals_whitelist_username
def get_approvals_whitelist_usernames
return [] if !enable_approvals_whitelist?
filter_empty_element Array(params[:approvals_whitelist_username])
filter_empty_element Array(params[:approvals_whitelist_usernames])
end
def check_users!(names)
@ -231,7 +231,7 @@ module ProtectedBranches
def gitea_protected_branch_params
{
approvals_whitelist_username: get_approvals_whitelist_username,
approvals_whitelist_username: get_approvals_whitelist_usernames,
branch_name: params[:branch_name],
enable_approvals_whitelist: enable_approvals_whitelist_params,
enable_merge_whitelist: enable_merge_whitelist_params,
@ -258,7 +258,7 @@ module ProtectedBranches
check_users!(get_push_whitelist_usernames) if get_push_whitelist_usernames.any?
check_users!(get_merge_whitelist_usernames) if get_merge_whitelist_usernames.any?
check_users!(get_approvals_whitelist_username) if get_approvals_whitelist_username.any?
check_users!(get_approvals_whitelist_usernames) if get_approvals_whitelist_usernames.any?
raise Error, '分支名称不能为空' if params[:branch_name].blank?