floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-05-03 03:40:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_trustie' of http://gitea.trustie.net/jasder/forgeplus into dev_trustie

Browse Source
This commit is contained in:
Jasder
2020-04-28 16:01:29 +08:00
parent 0d2eeea62f 7466ceb7dd
commit a3bb343690
8 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/issue_depends_controller.rb
View File

@@ -11,7 +11,7 @@ class IssueDependsController < ApplicationController
}
save_issue_depend = IssueDepend.new(issue_depend)
if save_issue_depend.save
@issue.custom_journal_detail("issue_depend","", @issue.id)
@issue.custom_journal_detail("issue_depend","", @issue.id, current_user&.id)
normal_status(0, "添加依赖成功")
else
normal_status(0, "添加依赖失败")
@@ -23,7 +23,7 @@ class IssueDependsController < ApplicationController
depend_issue_params = params[:id]
depend_issue = IssueDepend.find(depend_issue_params)
if depend_issue&.destroy
@issue.custom_journal_detail("destroy_issue_depend","", @issue.id)
@issue.custom_journal_detail("destroy_issue_depend","", @issue.id, current_user&.id)
normal_status(0, "删除依赖成功")
else
normal_status(-1, "删除依赖失败")

6
app/controllers/issue_times_controller.rb
View File

@@ -11,7 +11,7 @@ class IssueTimesController < ApplicationController
}
save_issue_time = IssueTime.new(issue_time)
if save_issue_time.save
@issue.custom_journal_detail("work_time",save_issue_time.id, "开始工作")
@issue.custom_journal_detail("work_time",save_issue_time.id, "开始工作", current_user&.id)
normal_status(0, "开始成功")
else
normal_status(0, "开始失败")
@@ -27,10 +27,10 @@ class IssueTimesController < ApplicationController
if last_work_time.update_all(end_time: end_work_time)
if end_type == 0
message = "取消时间跟踪"
@issue.custom_journal_detail("cancel_time",last_work_time&.first.try(:id), "取消时间跟踪")
@issue.custom_journal_detail("cancel_time",last_work_time&.first.try(:id), "取消时间跟踪", current_user&.id)
else
message = "停止工作"
@issue.custom_journal_detail("end_time",last_work_time&.first.try(:id), "停止工作")
@issue.custom_journal_detail("end_time",last_work_time&.first.try(:id), "停止工作", current_user&.id)
end
normal_status(0, message)
else

8
app/controllers/issues_controller.rb
View File

@@ -268,7 +268,7 @@ class IssuesController < ApplicationController
@issue.issue_times.update_all(end_time: Time.now)
end
@issue.create_journal_detail(change_files, issue_files, issue_file_ids)
@issue.create_journal_detail(change_files, issue_files, issue_file_ids, current_user&.id)
normal_status(0, "更新成功")
else
normal_status(-1, "更新失败")
@@ -338,7 +338,7 @@ class IssuesController < ApplicationController
else
close_message = "close_pr"
end
@issue.custom_journal_detail(close_message,old_message, "#{message}")
@issue.custom_journal_detail(close_message,old_message, "#{message}", current_user&.id)
normal_status(0, message)
else
@@ -351,9 +351,9 @@ class IssuesController < ApplicationController
type = (params[:lock_type].to_i == 1)
if @issue.update_attribute(:is_lock, type)
if type
@issue.custom_journal_detail("lock_issue","", "因为#{params[:lock_reason].present? ? params[:lock_reason].to_s : "某种原因"}而锁定，并将对话限制为协作者")
@issue.custom_journal_detail("lock_issue","", "因为#{params[:lock_reason].present? ? params[:lock_reason].to_s : "某种原因"}而锁定，并将对话限制为协作者", current_user&.id)
else
@issue.custom_journal_detail("unlock_issue","", "解除锁定")
@issue.custom_journal_detail("unlock_issue","", "解除锁定", current_user&.id)
end
normal_status(0, "操作成功")
else

6
app/controllers/members_controller.rb
View File

@@ -7,7 +7,7 @@ class MembersController < ApplicationController
before_action :check_member_not_exists!, only: %i[remove change_role]
def create
interactor = Projects::AddMemberInteractor.call(current_user, @project, @user)
interactor = Projects::AddMemberInteractor.call(@project.owner, @project, @user)
render_response(interactor)
rescue Exception => e
uid_logger_error(e.message)
@@ -21,7 +21,7 @@ class MembersController < ApplicationController
end
def remove
interactor = Projects::DeleteMemberInteractor.call(current_user, @project, @user)
interactor = Projects::DeleteMemberInteractor.call(@project.owner, @project, @user)
render_response(interactor)
rescue Exception => e
uid_logger_error(e.message)
@@ -29,7 +29,7 @@ class MembersController < ApplicationController
end
def change_role
interactor = Projects::ChangeMemberRoleInteractor.call(current_user, @project, @user, params[:role])
interactor = Projects::ChangeMemberRoleInteractor.call(@project.owner, @project, @user, params[:role])
render_response(interactor)
rescue Exception => e
uid_logger_error(e.message)

8
app/controllers/pull_requests_controller.rb
View File

@@ -138,7 +138,7 @@ class PullRequestsController < ApplicationController
end
local_requests.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "create")
if params[:title].to_s.include?("WIP:")
pull_issue.custom_journal_detail("WIP", "", "这个合并请求被标记为尚未完成的工作。完成后请从标题中移除WIP:前缀。")
pull_issue.custom_journal_detail("WIP", "", "这个合并请求被标记为尚未完成的工作。完成后请从标题中移除WIP:前缀。", current_user&.id)
end
normal_status(0, "PullRequest创建成功")
else
@@ -224,7 +224,7 @@ class PullRequestsController < ApplicationController
if params[:status_id].to_i == 5
@issue.issue_times.update_all(end_time: Time.now)
end
@issue.create_journal_detail(change_files, issue_files, issue_file_ids)
@issue.create_journal_detail(change_files, issue_files, issue_file_ids, current_user&.id)
normal_status(0, "PullRequest更新成功")
else
normal_status(-1, "PullRequest更新失败")
@@ -306,7 +306,7 @@ class PullRequestsController < ApplicationController
# @pull_request.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "merge")
@pull_request&.project_trends&.update_all(action_type: "close")
@issue&.custom_journal_detail("merge", "", "该合并请求已被合并")
@issue&.custom_journal_detail("merge", "", "该合并请求已被合并", current_user&.id)
normal_status(1, "合并成功")
else
normal_status(-1, "合并失败")
@@ -357,7 +357,7 @@ class PullRequestsController < ApplicationController
if merge_pr
@pull_request&.project_trends&.update_all(action_type: "close")
# @pull_request.project_trends.create(user_id: current_user.id, project_id: @project.id, action_type: "merge")
@issue.custom_journal_detail("merge", "", "该合并请求已被合并")
@issue.custom_journal_detail("merge", "", "该合并请求已被合并", current_user&.id)
normal_status(1, "评审成功")
else
normal_status(-1, "评审失败")

8
app/models/issue.rb
View File

@@ -30,9 +30,9 @@ class Issue < ApplicationRecord
User.select(:login, :lastname,:firstname, :nickname)&.find_by_id(self.assigned_to_id)
end
def create_journal_detail(change_files, issue_files, issue_file_ids)
def create_journal_detail(change_files, issue_files, issue_file_ids, user_id)
journal_params = {
journalized_id: self.id, journalized_type: "Issue", user_id: self.author_id
journalized_id: self.id, journalized_type: "Issue", user_id: user_id
}
journal = Journal.new journal_params
@@ -51,9 +51,9 @@ class Issue < ApplicationRecord
end
end
def custom_journal_detail(prop_key, old_value, value)
def custom_journal_detail(prop_key, old_value, value, user_id)
journal_params = {
journalized_id: self.id, journalized_type: "Issue", user_id: self.author_id
journalized_id: self.id, journalized_type: "Issue", user_id: user_id
}
journal = Journal.new journal_params
if journal.save