jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into dev_newproject

This commit is contained in:
huang 2016-11-02 17:30:18 +08:00
parent 22dff9245d fee436a7d4
commit a9e62618f1
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/homework_common_controller.rb
View File

@ -90,6 +90,10 @@ class HomeworkCommonController < ApplicationController
@homework.homework_tests.destroy_all @homework.homework_tests.destroy_all
elsif @homework.homework_type == 3 elsif @homework.homework_type == 3
@homework.homework_detail_group.destroy if @homework.homework_detail_group @homework.homework_detail_group.destroy if @homework.homework_detail_group
create_works_list @homework
end
if params[:homework_type].to_i == 3
@homework.student_works.destroy_all
end end
end end
@homework.homework_type = params[:homework_type].to_i || @homework.homework_type @homework.homework_type = params[:homework_type].to_i || @homework.homework_type

2
app/helpers/application_helper.rb
View File

@ -3681,7 +3681,7 @@ end
def create_works_list homework def create_works_list homework
unless homework.course.nil? unless homework.course.nil?
students = homework.course.student students = homework.course.student
if !students.empty? if !students.empty? && homework.student_works.empty?
name = homework.name name = homework.name
name_str = name + "的作品提交" name_str = name + "的作品提交"
str = "" str = ""