diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index c4ef0fe60..c0e99d546 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -20,7 +20,7 @@ class CoursesController < ApplicationController before_filter :can_show_course, :except => [] before_filter :logged_user_by_apptoken,:only => [:show,:new_homework,:feedback] before_filter :find_course, :except => [ :index, :search,:list, :new,:join,:unjoin, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches,:join_private_courses] - before_filter :authorize_course, :only => [:show, :settings, :edit, :update, :modules, :close, :reopen, :view_homework_attaches, :course,:search_member] + before_filter :authorize_course, :only => [:show, :settings, :edit, :update, :modules, :close, :reopen, :view_homework_attaches, :course] before_filter :authorize_course_global, :only => [:view_homework_attaches, :new,:create] before_filter :require_admin, :only => [:copy, :archive, :unarchive, :destroy, :calendar] before_filter :toggleCourse, :only => [:finishcourse, :restartcourse] @@ -419,8 +419,8 @@ class CoursesController < ApplicationController end def search_member - if User.current.allowed_to?(:as_teacher,@course) - q = "#{params[:q].strip}" + if User.current.allowed_to?(:as_teacher,@course) || User.current.admin + q = "#{params[:name].strip}" @roles = Role.givable.all[3..5] if q.nil? || q == "" @members = @course.member_principals.includes(:roles, :principal).all.sort diff --git a/app/views/courses/_course_members.html.erb b/app/views/courses/_course_members.html.erb index db6ec4b55..a6a3594de 100644 --- a/app/views/courses/_course_members.html.erb +++ b/app/views/courses/_course_members.html.erb @@ -1,14 +1,15 @@
<%= form_tag({:controller => 'courses', :action => 'search_member'},:id => "course_member_search_form", :method => :get, :class => "search_form_course",:remote => true) do %> - <%= text_field_tag 'q', params[:q], :placeholder => l(:label_user_name), :class => "search_text fl" %> - + <%= text_field_tag 'name', params[:name], :placeholder => "昵称、学号、姓名搜索", :class => "search_text fl" %> + <%= l(:label_search)%>
<% end %>
+