qyzh1996
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 

Conflicts:
	app/views/courses/_member_list.html.erb
This commit is contained in:
sw 2014-12-06 13:46:42 +08:00
parent b51cd1aabb 19936fa05f
commit 060b856b23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/courses_controller.rb
View File

@ -199,6 +199,7 @@ class CoursesController < ApplicationController
end end
def searchmembers def searchmembers
@subPage_title = l :label_student_list
@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
@ -211,6 +212,7 @@ class CoursesController < ApplicationController
end end
def addgroups def addgroups
@subPage_title = l :label_student_list
if params[:group_name] if params[:group_name]
group = CourseGroup.new group = CourseGroup.new
group.name = params[:group_name] group.name = params[:group_name]
@ -225,6 +227,7 @@ class CoursesController < ApplicationController
end end
def updategroupname def updategroupname
@subPage_title = l :label_student_list
if params[:group_name] if params[:group_name]
group = CourseGroup.find(params[:group_id]) group = CourseGroup.find(params[:group_id])
group.name = params[:group_name] group.name = params[:group_name]
@ -237,6 +240,7 @@ class CoursesController < ApplicationController
@course_groups = @course.course_groups @course_groups = @course.course_groups
end end
def join_group def join_group
@subPage_title = l :label_student_list
group = CourseGroup.find(params[:object_id]) group = CourseGroup.find(params[:object_id])
member = Member.where(:course_id => @course.id, :user_id => User.current.id).first member = Member.where(:course_id => @course.id, :user_id => User.current.id).first
member.course_group_id = group.id member.course_group_id = group.id
@ -248,6 +252,7 @@ class CoursesController < ApplicationController
search_group_members group search_group_members group
end end
def unjoin_group def unjoin_group
@subPage_title = l :label_student_list
group = CourseGroup.find(params[:object_id]) group = CourseGroup.find(params[:object_id])
member = Member.where(:course_id => @course.id, :user_id => User.current.id).first member = Member.where(:course_id => @course.id, :user_id => User.current.id).first
member.course_group_id = 0 member.course_group_id = 0
@ -259,6 +264,7 @@ class CoursesController < ApplicationController
search_group_members group search_group_members group
end end
def searchgroupmembers def searchgroupmembers
@subPage_title = l :label_student_list
@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
@ -273,6 +279,7 @@ class CoursesController < ApplicationController
@results = paginateHelper @results @results = paginateHelper @results
end end
def search_group_members group def search_group_members group
@subPage_title = l :label_student_list
@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

1
app/controllers/members_controller.rb
View File

@ -217,6 +217,7 @@ class MembersController < ApplicationController
joined.each do |join| joined.each do |join|
join.delete join.delete
end end
@member.course_group_id = 0
end end
if role.allowed_to?(:is_manager) if role.allowed_to?(:is_manager)
@courseInfo = CourseInfos.new(:user_id => @member.user_id, :course_id => @course.id) @courseInfo = CourseInfos.new(:user_id => @member.user_id, :course_id => @course.id)