|
|
@ -906,7 +906,6 @@ class CoursesController < ApplicationController
|
|
|
|
|
|
|
|
|
|
|
|
CourseAddStudentCreateWorksJob.perform_later(course.id, [current_user.id])
|
|
|
|
CourseAddStudentCreateWorksJob.perform_later(course.id, [current_user.id])
|
|
|
|
StudentJoinCourseNotifyJob.perform_later(current_user.id, course.id)
|
|
|
|
StudentJoinCourseNotifyJob.perform_later(current_user.id, course.id)
|
|
|
|
logger.info("#####################{course.id}")
|
|
|
|
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
@ -927,14 +926,18 @@ class CoursesController < ApplicationController
|
|
|
|
|
|
|
|
|
|
|
|
role = course_message.content == 2 ? '7' : '9' # 7:老师 9:助教
|
|
|
|
role = course_message.content == 2 ? '7' : '9' # 7:老师 9:助教
|
|
|
|
ApplyTeacherRoleJoinCourseNotifyJob.perform_later(current_user.id, course.id, role)
|
|
|
|
ApplyTeacherRoleJoinCourseNotifyJob.perform_later(current_user.id, course.id, role)
|
|
|
|
|
|
|
|
teacher_role = 1
|
|
|
|
|
|
|
|
message = "#{course_message.content == 2 ? '教师' : '助教'}申请已提交,请等待审核"
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
if current_user.student_of_course?(course) || current_user.teacher_of_course?(course)
|
|
|
|
if teacher_role && current_user.student_of_course?(course)
|
|
|
|
render json: { status: 0, message: "成功", course_id: course.id}
|
|
|
|
render json: { status: 0, message: message, course_id: course.id}
|
|
|
|
|
|
|
|
elsif current_user.student_of_course?(course)
|
|
|
|
|
|
|
|
render json: { status: 0, message: "加入成功", course_id: course.id}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
normal_status("申请已提交,请等待审核")
|
|
|
|
normal_status(message)
|
|
|
|
end
|
|
|
|
end
|
|
|
|
rescue => e
|
|
|
|
rescue => e
|
|
|
|
uid_logger(e.message)
|
|
|
|
uid_logger(e.message)
|
|
|
|