修改用户全部项目的筛选
This commit is contained in:
parent
284121b54b
commit
147b8573ea
|
@ -11,11 +11,11 @@ class Projects::ListMyQuery < ApplicationQuery
|
||||||
|
|
||||||
def call
|
def call
|
||||||
if params[:category].blank?
|
if params[:category].blank?
|
||||||
projects = current_user.projects
|
projects = Project.joins(:members).where(members: { user_id: current_user.id })
|
||||||
elsif params[:category].to_s == "manage"
|
elsif params[:category].to_s == "manage"
|
||||||
projects = Project.where(user_id: current_user.id)
|
projects = Project.where(user_id: current_user.id)
|
||||||
else
|
else
|
||||||
projects = Project.where.not(user_id: current_user.id).joins(:members).where("members.user_id = ?", current_user.id)
|
projects = Project.where.not(user_id: current_user.id).joins(:members).where(members: { user_id: current_user.id })
|
||||||
end
|
end
|
||||||
scope = projects.includes(:members,:issues,:project_category, :project_language, owner: :user_extension).like(params[:search])
|
scope = projects.includes(:members,:issues,:project_category, :project_language, owner: :user_extension).like(params[:search])
|
||||||
.with_project_type(params[:project_type])
|
.with_project_type(params[:project_type])
|
||||||
|
|
|
@ -12,7 +12,7 @@ json.projects do
|
||||||
json.is_public project.is_public
|
json.is_public project.is_public
|
||||||
json.owner do
|
json.owner do
|
||||||
json.real_name user.present? ? user.try(:real_name) : "未知用户"
|
json.real_name user.present? ? user.try(:real_name) : "未知用户"
|
||||||
json.avatar_url user.present? ? url_to_avatar(user) : "images/avatars/User/b"
|
json.avatar_url user.present? ? url_to_avatar(user) : "avatars/User/b"
|
||||||
# json.school_name user.school_name
|
# json.school_name user.school_name
|
||||||
end
|
end
|
||||||
json.category do
|
json.category do
|
||||||
|
|
Loading…
Reference in New Issue