Trustie
/
forgeplus
forked from Gitlink/forgeplus
21
0
Fork 8
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复：找不到type

This commit is contained in:
yystopf 2024-04-08 08:48:07 +08:00
parent baf2d03668
commit ce0f70c836
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/projects_controller.rb
View File

@ -231,7 +231,8 @@ class ProjectsController < ApplicationController
end end
def user_actions def user_actions
user_actions = UserAction.where(action_type: "ViewProject-#{@project.id}").includes(:user).merge(User.like(params[:search])) user_actions = UserAction.where(action_type: "ViewProject-#{@project.id}").joins(:user)
user_actions = user_actions.merge(User.like(params[:search]))
@user_actions = kaminari_paginate(user_actions) @user_actions = kaminari_paginate(user_actions)
end end

2
app/views/projects/user_actions.json.jbuilder
View File

@ -1,4 +1,4 @@
json.count @user_actions.total_count json.total_count @user_actions.total_count
json.users do json.users do
json.partial! "/projects/list_user_secret", collection: @user_actions, as: :target json.partial! "/projects/list_user_secret", collection: @user_actions, as: :target
end end