Browse Source

fix: undo events

tags/v4.0.0^2
yystopf 4 years ago
parent
commit
8011dabaac
2 changed files with 14 additions and 9 deletions
  1. +2
    -1
      app/controllers/users_controller.rb
  2. +12
    -8
      app/views/projects/applied_transfer_projects/_detail.json.jbuilder

+ 2
- 1
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


+ 12
- 8
app/views/projects/applied_transfer_projects/_detail.json.jbuilder View File

@@ -1,13 +1,17 @@
project = object.project
json.project do
json.id project.id
json.identifier project.identifier
json.name project.name
json.description project.description
json.is_public project.is_public
json.owner do
json.partial! "/users/user_simple", locals: {user: project.owner}
if project.present?
json.project do
json.id project.id
json.identifier project.identifier
json.name project.name
json.description project.description
json.is_public project.is_public
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}


Loading…
Cancel
Save