[ADD]search is_member is_admin

app/controllers/organizations/organization_users_controller.rb

@@ -4,6 +4,8 @@ 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).where("LOWER(concat(users.lastname, users.firstname, users.login, users.mail, users.nickname)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present?
 
     @organization_users = kaminari_paginate(@organization_users)
   end

app/controllers/organizations/organizations_controller.rb

@@ -18,6 +18,8 @@ class Organizations::OrganizationsController < Organizations::BaseController
   end
 
   def show
+    @is_admin = can_edit_org?
+    @is_member = @organization.is_member?(current_user.id)
   end
 
   def create

app/controllers/organizations/projects_controller.rb

@@ -14,6 +14,19 @@ class Organizations::ProjectsController < Organizations::BaseController
     @projects = paginate(@projects)
   end
 
+  def search
+    tip_exception("请输入搜索关键词") if params[:search].nil?
+    public_projects_sql = @organization.projects.where(is_public: true).to_sql
+    private_projects_sql = @organization.projects
+                               .where(is_public: false)
+                               .joins(team_projects: {team: :team_users})
+                               .where(team_users: {user_id: current_user.id}).to_sql
+    @projects = Project.from("( #{ public_projects_sql} UNION #{ private_projects_sql } ) AS projects")
+
+    @projects = @projects.ransack(name_or_identifier_cont: params[:search]).result
+    @projects = @projects.includes(:owner).order("projects.#{sort} #{sort_direction}")
+  end
+
   private
 
   def load_organization

app/controllers/organizations/team_users_controller.rb

@@ -7,6 +7,9 @@ class Organizations::TeamUsersController < Organizations::BaseController
   def index
     @team_users = @team.team_users
 
+    search = params[:search].to_s.downcase
+    @team_users = @team_users.joins(:user).where("LOWER(concat(users.lastname, users.firstname, users.login, users.mail, users.nickname)) LIKE ?", "%#{search.split(" ").join('|')}%") if search.present?
+
     @team_users = kaminari_paginate(@team_users)
   end
 

app/controllers/organizations/teams_controller.rb

@@ -14,6 +14,8 @@ class Organizations::TeamsController < Organizations::BaseController
   end
 
   def show
+    @is_admin = can_edit_org?
+    @is_member = @team.is_member?(current_user.id)
   end
 
   def create