Merge branch 'educoder' into develop

app/controllers/managements_controller.rb

@@ -1087,7 +1087,7 @@ end
     @only_teacher = @competition.competition_staffs.count == 1 && @competition.competition_staffs.first.category == 'teacher'
 
     @team_members = @competition.team_members
-    @team_members = @team_members.where(is_teacher: false) unless @only_teacher # 只有老师报名时才显示老师，此时老师作为队员
+    @team_members = @team_members.where("team_members.is_teacher = 0") unless @only_teacher # 只有老师报名时才显示老师，此时老师作为队员
 
     if params[:school] || params[:location]
       school_ids = School.where("schools.name like '%#{params[:school]}%'").pluck(:id)

app/models/competition_team.rb

@@ -4,8 +4,8 @@ class CompetitionTeam < ActiveRecord::Base
   belongs_to :competition
 
   has_many :team_members, :dependent => :destroy
-  has_many :members, conditions: 'is_teacher = 0', class_name: 'TeamMember'
+  has_many :members, conditions: 'team_members.is_teacher = 0', class_name: 'TeamMember'
-  has_many :teachers, conditions: 'is_teacher = 1', class_name: 'TeamMember'
+  has_many :teachers, conditions: 'team_members.is_teacher = 1', class_name: 'TeamMember'
   has_many :competition_scores, :dependent => :destroy
   # team_type  0：组队  1：个人
   # attr_accessible :invite_code, :name, :team_type