修改合并引起的bug

Signed-off-by: alan <547533434@qq.com>
zh
alan 11 years ago
parent a51d0e88dc
commit c5a7baa454

@ -217,6 +217,10 @@ class CoursesController < ApplicationController
group.course_id = @course.id group.course_id = @course.id
group.save group.save
end end
@canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
@is_remote = true
@members = searchStudent(@course)
@membercount = @members.count
@course_groups = @course.course_groups @course_groups = @course.course_groups
end end
@ -228,6 +232,8 @@ class CoursesController < ApplicationController
end end
@canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1' @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
@is_remote = true @is_remote = true
@members = searchStudent(@course)
@membercount = @members.count
@course_groups = @course.course_groups @course_groups = @course.course_groups
end end
def join_group def join_group
@ -236,7 +242,8 @@ class CoursesController < ApplicationController
member.course_group_id = group.id member.course_group_id = group.id
member.save member.save
@group = group @group = group
@members = searchStudent(@course)
@membercount = @members.count
search_group_members group search_group_members group
end end
def unjoin_group def unjoin_group
@ -245,7 +252,8 @@ class CoursesController < ApplicationController
member.course_group_id = 0 member.course_group_id = 0
member.save member.save
@group = group @group = group
@members = searchStudent(@course)
@membercount = @members.count
search_group_members group search_group_members group
end end
def searchgroupmembers def searchgroupmembers
@ -258,14 +266,16 @@ class CoursesController < ApplicationController
else else
@results = searchStudent(@course) @results = searchStudent(@course)
end end
@members = searchStudent(@course)
@membercount = @members.count
@results = paginateHelper @results @results = paginateHelper @results
end end
def search_group_members group def search_group_members group
@render_file = 'member_list' @render_file = 'member_list'
@canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1' @canShowCode = isCourseTeacher(User.current.id,@course) && params[:role] != '1'
@is_remote = true @is_remote = true
@members = searchStudent(@course)
@membercount = @members.count
@results = searchStudent_by_group(group, @course) @results = searchStudent_by_group(group, @course)
@results = paginateHelper @results @results = paginateHelper @results
end end
@ -284,11 +294,10 @@ class CoursesController < ApplicationController
@members = searchTeacherAndAssistant(@course) @members = searchTeacherAndAssistant(@course)
when '2' when '2'
@subPage_title = l :label_student_list @subPage_title = l :label_student_list
if @course_group_id
@members = search_student_in_group(@course, @course_group_id)
else
@members = searchStudent(@course) @members = searchStudent(@course)
end @membercount = @members.count
else else
@subPage_title = '' @subPage_title = ''
@members = @course.member_principals.includes(:roles, :principal).all.sort @members = @course.member_principals.includes(:roles, :principal).all.sort

@ -22,7 +22,7 @@
validate_groupname_null(value1); validate_groupname_null(value1);
document.getElementsByName('group_name')[0].value = ""; document.getElementsByName('group_name')[0].value = "";
} }
</script>" </script>
<ul> <ul>

Loading…
Cancel
Save