添加合作者

dev_forum
daiao 5 years ago
parent 0576924ab6
commit 54196a44c5

@ -8,7 +8,7 @@ class ChallengesController < ApplicationController
# 关卡更新和操作的权限控制 # 关卡更新和操作的权限控制
before_action :update_allowed, except: [:index] before_action :update_allowed, except: [:index]
# 关卡访问的权限控制 # 关卡访问的权限控制
before_action :shixun_access_allowed before_action :shixun_access_allowed, only: [:index]
include ShixunsHelper include ShixunsHelper
include ChallengesHelper include ChallengesHelper

@ -624,12 +624,12 @@ class ShixunsController < ApplicationController
def add_collaborators def add_collaborators
member_ids = "(" + @shixun.shixun_members.map(&:user_id).join(',') + ")" member_ids = "(" + @shixun.shixun_members.map(&:user_id).join(',') + ")"
user_name = "%#{params[:user_name].strip}%" user_name = "%#{params[:user_name].to_s.strip}%"
school_name = "%#{params[:school_name].strip}%" school_name = "%#{params[:school_name].to_s.strip}%"
if user_name.present? || school_name.present? if user_name.present? || school_name.present?
@users = User.joins(user_extension: :school).where("users.id not in #{member_ids} AND users.status = 1 AND @users = User.joins(user_extension: :school).where("users.id not in #{member_ids} AND users.status = 1 AND
LOWER(users.lastname) LIKE '#{user_name}' AND LOWER(schools.name) LIKE LOWER(users.lastname) LIKE '#{user_name}' AND LOWER(schools.name) LIKE
'#{school_name}'") '#{school_name}'").limit(20)
else else
@users = User.none @users = User.none
end end

Loading…
Cancel
Save