Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into issues25489

issues25489
杨树林 5 years ago
commit d85be4399e

@ -19,6 +19,7 @@ json.allow_late @homework.allow_late
if @user_course_identity < Course::STUDENT if @user_course_identity < Course::STUDENT
json.calculation_time @homework.calculation_time if @homework.homework_type == "practice" json.calculation_time @homework.calculation_time if @homework.homework_type == "practice"
json.answer_open_evaluation @homework_detail_manual.answer_open_evaluation if @homework.homework_type == "practice"
# 教师身份的评阅、提交状态、分班过滤 # 教师身份的评阅、提交状态、分班过滤
if @homework.homework_type != "practice" if @homework.homework_type != "practice"
json.teacher_comment teacher_comment @homework, @current_user.id json.teacher_comment teacher_comment @homework, @current_user.id

@ -146,8 +146,8 @@ class CompetitionContents extends Component{
} }
})} })}
console.log(this.props&&this.props.mode) // console.log(this.props&&this.props.mode)
console.log(columns) // console.log(columns)
return ( return (
<div> <div>

Loading…
Cancel
Save