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

add: undo count

This commit is contained in:
vilet.yy 2021-04-27 15:43:37 +08:00
parent b68c9945e5
commit 120a33bc8a
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/users_controller.rb
View File

@ -32,6 +32,8 @@ class UsersController < ApplicationController
@common_applied_transfer_projects = AppliedTransferProject.where(owner_id: @user.id).common + AppliedTransferProject.where(owner_id: Organization.joins(team_users: :team).where(team_users: {user_id: @user.id}, teams: {authorize: %w(admin owner)} )).common @common_applied_transfer_projects = AppliedTransferProject.where(owner_id: @user.id).common + AppliedTransferProject.where(owner_id: Organization.joins(team_users: :team).where(team_users: {user_id: @user.id}, teams: {authorize: %w(admin owner)} )).common
@undo_events = @waiting_applied_messages.size + @common_applied_transfer_projects.size @undo_events = @waiting_applied_messages.size + @common_applied_transfer_projects.size
else else
@waiting_applied_messages = AppliedMessage.none
@common_applied_transfer_projects = AppliedTransferProject.none
@undo_events = 0 @undo_events = 0
end end
#用户的组织数量 #用户的组织数量

6
app/jobs/send_transfer_project_applied_message_job.rb
View File

@ -16,7 +16,7 @@ class SendTransferProjectAppliedMessageJob < ApplicationJob
AppliedMessage.create!(user_id: rec.user_id, AppliedMessage.create!(user_id: rec.user_id,
applied: applied_transfer_project, applied: applied_transfer_project,
status: message_status, status: message_status,
name: build_name(project.name, applied_transfer_project&.owner&.real_name, message_status), name: build_name(project.name, applied_transfer_project&.owner&.real_name, message_status, applied_user&.real_name),
applied_user_id: applied_user.id, applied_user_id: applied_user.id,
project_id: project.id) project_id: project.id)
end end
@ -31,7 +31,7 @@ class SendTransferProjectAppliedMessageJob < ApplicationJob
end end
private private
def build_name(repo_name, owner_name, message_status) def build_name(repo_name, owner_name, message_status, applied_name="")
case message_status case message_status
when 'canceled' when 'canceled'
return "取消转移【#{repo_name}】仓库" return "取消转移【#{repo_name}】仓库"
@ -40,7 +40,7 @@ class SendTransferProjectAppliedMessageJob < ApplicationJob
when 'successed' when 'successed'
return "【#{repo_name}】仓库成功转移给【#{owner_name}】" return "【#{repo_name}】仓库成功转移给【#{owner_name}】"
when 'failure' when 'failure'
return "【#{repo_name}】仓库转移失败" return "拒绝转移【#{repo_name}】仓库"
end end
"" ""
end end

2
app/views/users/show.json.jbuilder
View File

@ -10,6 +10,8 @@ json.user_identity @user.identity
json.is_watch current_user&.watched?(@user) json.is_watch current_user&.watched?(@user)
json.watched_count @user.fan_count #粉丝 json.watched_count @user.fan_count #粉丝
json.watching_count @user.follow_count #关注数 json.watching_count @user.follow_count #关注数
json.undo_messages @waiting_applied_messages.size
json.undo_transfer_projects @common_applied_transfer_projects.size
json.undo_events @undo_events json.undo_events @undo_events
json.user_composes_count @user_composes_count json.user_composes_count @user_composes_count
json.user_org_count @user_org_count json.user_org_count @user_org_count