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 branch 'standalone_develop' into pre_trustie_server

This commit is contained in:
yystopf 2022-01-26 13:47:14 +08:00
parent b9e2a6edf1 3ce9b2d145
commit 2738d950d4
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/issues_controller.rb
View File

@ -29,9 +29,9 @@ class IssuesController < ApplicationController
@close_issues = @all_issues.where(status_id: IssueStatus::CLOSED) @close_issues = @all_issues.where(status_id: IssueStatus::CLOSED)
scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?}, "Issue") scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?}, "Issue")
@issues_size = scopes.size @issues_size = scopes.size
@assign_to_me = scopes.where(assigned_to_id: current_user&.id)
@my_published = scopes.where(author_id: current_user&.id)
@issues = paginate(scopes) @issues = paginate(scopes)
@assign_to_me = @issues.where(assigned_to_id: current_user&.id)
@my_published = @issues.where(author_id: current_user&.id)
respond_to do |format| respond_to do |format|
format.json format.json
@ -149,6 +149,8 @@ class IssuesController < ApplicationController
end end
@issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create") @issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
@issue.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: ProjectTrend::CLOSE) if params[:status_id].to_i == 5
Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}" Rails.logger.info "[ATME] maybe to at such users: #{@atme_receivers.pluck(:login)}"
AtmeService.call(current_user, @atme_receivers, @issue) if @atme_receivers.size > 0 AtmeService.call(current_user, @atme_receivers, @issue) if @atme_receivers.size > 0

6
app/services/projects/transfer_service.rb
View File

@ -14,6 +14,7 @@ class Projects::TransferService < ApplicationService
update_owner update_owner
update_repo_url update_repo_url
update_visit_teams update_visit_teams
update_fork_info
end end
Rails.logger.info("##### Project transfer_service end ######") Rails.logger.info("##### Project transfer_service end ######")
@ -40,6 +41,11 @@ class Projects::TransferService < ApplicationService
end end
end end
def update_fork_info
fork_user = ForkUser.find_by(user_id: @owner.id, fork_project_id: @project.id)
fork_user.update(user_id: @new_owner.id) if fork_user.present?
end
def gitea_update_owner def gitea_update_owner
begin begin
@gitea_repo = Gitea::Repository::TransferService.call(owner&.gitea_token, owner&.login, project.identifier, new_owner&.login) @gitea_repo = Gitea::Repository::TransferService.call(owner&.gitea_token, owner&.login, project.identifier, new_owner&.login)