floraachy/gitlink-forgeplus
1
0
Fork 0
mirror of https://gitlink.org.cn/Gitlink/forgeplus.git synced 2026-07-14 22:24:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

add: organization users insist team nickname search

Browse Source
This commit is contained in:
yystopf
2022-03-07 09:58:05 +08:00
parent 1dd3fbc69a
commit 5cb2e55f74
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/organizations/organization_users_controller.rb
+5 -1
View File
@@ -5,7 +5,11 @@ class Organizations::OrganizationUsersController < Organizations::BaseController
def index
@organization_users = @organization.organization_users.includes(:user)
search = params[:search].to_s.downcase
@organization_users = @organization_users.joins(:user).merge(User.like(search))
user_condition_users = User.like(search).to_sql
team_condition_teams = User.joins(:teams).merge(@organization.teams.like(search)).to_sql
users = User.from("( #{user_condition_users} UNION #{team_condition_teams }) AS users")
@organization_users = @organization_users.where(user_id: users).distinct
@organization_users = kaminari_paginate(@organization_users)
end