floraachy
/
gitlink-forgeplus
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request '修复签署协议失败问题' (#73) from KingChan/forgeplus:chenjing into standalone_develop

This commit is contained in:
KingChan 2023-06-19 15:11:31 +08:00
parent eebbc348f4 325f345381
commit 897c21e682
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/models/user_cla.rb
View File

@ -30,8 +30,8 @@ class UserCla < ApplicationRecord
fresh_pull_request
end
def self.build(params,user_id)
self.create!(user_id: user_id,
def self.build(params,current_user_id)
self.create!(user_id: current_user_id,
cla_id: params[:cla_id],
real_name: params[:real_name],
email: params[:email],
@ -40,11 +40,11 @@ class UserCla < ApplicationRecord
end
def fresh_pull_request
gitea_ids = Project.where(user_id: cla.user_id).pluck(:gpid)
project_ids = cla.organization.projects.pluck(:id)
if state == "signed"
PullRequest.where(user_id: user_id, gitea_id: gitea_ids, status:3).update_all(status:0)
PullRequest.where(user_id: user_id, project_id: project_ids, status:3).update_all(status:0)
else
PullRequest.where(user_id: user_id, gitea_id: gitea_ids, status:0).update_all(status:3)
PullRequest.where(user_id: user_id, project_id: project_ids, status:0).update_all(status:3)
end
end