From 2dc79052c2fdfb49d99734033023aae04bc9267b Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 25 Jan 2022 10:34:20 +0800 Subject: [PATCH 1/3] fix: create project trend when status is closed --- app/controllers/issues_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index f6244a269..8305f2e4b 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -149,6 +149,8 @@ class IssuesController < ApplicationController 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: ProjectTrend::CLOSE) if params[:status_id].to_i == 5 + 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 From 1e9a32a93ebe0bc1b6495fa5daf27d89a1572a5e Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 25 Jan 2022 11:39:06 +0800 Subject: [PATCH 2/3] fix: issues select count paginator --- app/controllers/issues_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index 8305f2e4b..5590d9e87 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -29,9 +29,9 @@ class IssuesController < ApplicationController @close_issues = @all_issues.where(status_id: IssueStatus::CLOSED) scopes = Issues::ListQueryService.call(issues,params.delete_if{|k,v| v.blank?}, "Issue") @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) - @assign_to_me = @issues.where(assigned_to_id: current_user&.id) - @my_published = @issues.where(author_id: current_user&.id) respond_to do |format| format.json From 26f87fba16a1d6ce9f8f7f7e32c236eeee04642e Mon Sep 17 00:00:00 2001 From: yystopf Date: Tue, 25 Jan 2022 14:26:11 +0800 Subject: [PATCH 3/3] fix: edit transfer need change fork info --- app/services/projects/transfer_service.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb index 71c6ff68e..7d1214eb8 100644 --- a/app/services/projects/transfer_service.rb +++ b/app/services/projects/transfer_service.rb @@ -14,6 +14,7 @@ class Projects::TransferService < ApplicationService update_owner update_repo_url update_visit_teams + update_fork_info end Rails.logger.info("##### Project transfer_service end ######") @@ -40,6 +41,11 @@ class Projects::TransferService < ApplicationService 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 begin @gitea_repo = Gitea::Repository::TransferService.call(owner&.gitea_token, owner&.login, project.identifier, new_owner&.login)