Merge branch 'master' into 'master'

超级管理员的单位列表补全新增单位和编辑单位的功能

超级管理员的单位列表补全新增单位和编辑单位的功能 

See merge request !47

app/controllers/contests_controller.rb

@@ -326,15 +326,6 @@ ContestMessage.where(:user_id => User.current.id, :contest_id => @contest.id, :c
   # 成员列表
   def member
     if (User.current.admin? || @contest.is_public || (!@contest.is_public && User.current.member_of_contest?(@contest)))
-      @role = params[:role].nil? ? '3' : params[:role]
-      case @role
-        when '1'
-          @members = contest_managers @contest
-        when '2'
-          @members = contest_judges @contest
-        when '3'
-          @members = contest_contestants @contest
-      end
       if params[:name]
         q = "#{params[:name].strip}"
         @members = search_member_by_name_login_school @members, q