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

fix: undo events

Browse Source
This commit is contained in:
yystopf
2021-11-18 17:02:09 +08:00
parent 88a08e73c0
commit 8011dabaac
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/users_controller.rb
View File

@@ -32,7 +32,8 @@ class UsersController < ApplicationController
@waiting_applied_messages = @user.applied_messages.waiting
@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_projects = AppliedProject.where(project_id: @user.full_admin_projects).common
@undo_events = @waiting_applied_messages.size + @common_applied_transfer_projects.size + @common_applied_projects.size
#@undo_events = @waiting_applied_messages.size + @common_applied_transfer_projects.size + @common_applied_projects.size
@undo_events = @common_applied_transfer_projects.size + @common_applied_projects.size
else
@waiting_applied_messages = AppliedMessage.none
@common_applied_transfer_projects = AppliedTransferProject.none

6
app/views/projects/applied_transfer_projects/_detail.json.jbuilder
View File

@@ -1,5 +1,6 @@
project = object.project
json.project do
if project.present?
json.project do
json.id project.id
json.identifier project.identifier
json.name project.name
@@ -8,6 +9,9 @@ json.project do
json.owner do
json.partial! "/users/user_simple", locals: {user: project.owner}
end
end
else
json.project nil
end
json.user do
json.partial! "/users/user_simple", locals: {user: object.user}