diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb index 4511e5a1f..81e0a080a 100644 --- a/app/controllers/homework_common_controller.rb +++ b/app/controllers/homework_common_controller.rb @@ -231,8 +231,8 @@ class HomeworkCommonController < ApplicationController end end end - @homework_detail_manual.update_column('comment_status', 2) - @homework_detail_manual.update_column('evaluation_start', Date.today) + @homework_detail_manual.update_attribute('comment_status', 2) + @homework_detail_manual.update_attribute('evaluation_start', Date.today) @statue = 1 # 匿评开启消息邮件通知 send_message_anonymous_comment(@homework, m_status = 2) diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index 27b6ed272..63b14fc53 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -1021,14 +1021,14 @@ class StudentWorkController < ApplicationController end def forbidden_anonymous_comment - @homework.update_column('anonymous_comment', 1) + @homework.update_attribute('anonymous_comment', 1) homework_detail_manual = @homework.homework_detail_manual homework_detail_programing = @homework.homework_detail_programing if homework_detail_programing - homework_detail_manual.update_column('ta_proportion', 0.4) - homework_detail_programing.update_column('ta_proportion', 0.6) + homework_detail_manual.update_attribute('ta_proportion', 0.4) + homework_detail_programing.update_attribute('ta_proportion', 0.6) else - homework_detail_manual.update_column('ta_proportion', 1.0) + homework_detail_manual.update_attribute('ta_proportion', 1.0) end @homework.student_works.each do |student_work| set_final_score @homework,student_work @@ -1067,7 +1067,7 @@ class StudentWorkController < ApplicationController def student_work_project @work = @homework.student_works.where("user_id = #{User.current.id} and work_status = 0").first if @work - @work.update_column('project_id', params[:projectName].to_i) + @work.attribute('project_id', params[:projectName].to_i) end @project = StudentWorkProject.new @project.homework_common_id = @homework.id @@ -1075,6 +1075,7 @@ class StudentWorkController < ApplicationController @project.user_id = User.current.id @project.is_leader = 1 if @project.save + find_homework @user_activity_id = params[:user_activity_id].to_i @hw_status = params[:hw_status].to_i @is_teacher = User.current.allowed_to?(:as_teacher,@homework.course) || User.current.admin? @@ -1122,10 +1123,11 @@ class StudentWorkController < ApplicationController def cancel_relate_project @work = @homework.student_works.where("user_id = #{User.current.id} and work_status = 0").first if @work - @work.update_column('project_id', 0) + @work.update_attribute('project_id', 0) end relate_pro = StudentWorkProject.where("user_id = #{User.current.id} and homework_common_id = #{@homework.id}").first if relate_pro.destroy + find_homework @user_activity_id = params[:user_activity_id].to_i @hw_status = params[:hw_status].to_i @is_teacher = User.current.allowed_to?(:as_teacher,@homework.course) || User.current.admin? diff --git a/app/models/homework_detail_manual.rb b/app/models/homework_detail_manual.rb index e0c4dcdcb..501395700 100644 --- a/app/models/homework_detail_manual.rb +++ b/app/models/homework_detail_manual.rb @@ -3,5 +3,5 @@ class HomeworkDetailManual < ActiveRecord::Base attr_accessible :ta_proportion, :comment_status, :evaluation_start, :evaluation_end, :evaluation_num, :absence_penalty, :homework_common_id - belongs_to :homework_common + belongs_to :homework_common,touch:true end diff --git a/app/models/homework_detail_programing.rb b/app/models/homework_detail_programing.rb index 0c445d672..80804d5af 100644 --- a/app/models/homework_detail_programing.rb +++ b/app/models/homework_detail_programing.rb @@ -1,7 +1,7 @@ class HomeworkDetailPrograming < ActiveRecord::Base attr_accessible :language, :standard_code, :homework_common_id - belongs_to :homework_common + belongs_to :homework_common,touch:true def language_name %W(C C++ Python Java).at(self.language.to_i - 1) diff --git a/app/models/student_work.rb b/app/models/student_work.rb index a3f692341..4b63c4f21 100644 --- a/app/models/student_work.rb +++ b/app/models/student_work.rb @@ -2,7 +2,7 @@ class StudentWork < ActiveRecord::Base attr_accessible :name, :description, :homework_common_id, :user_id, :final_score, :teacher_score, :student_score, :teaching_asistant_score, :system_score, :work_score, :project_id, :is_test, :simi_id, :simi_value, :work_status, :commit_time - belongs_to :homework_common + belongs_to :homework_common,touch:true belongs_to :user has_many :student_work_projects has_many :student_works_evaluation_distributions, :dependent => :destroy diff --git a/app/models/student_work_project.rb b/app/models/student_work_project.rb index 676071817..831e588f5 100644 --- a/app/models/student_work_project.rb +++ b/app/models/student_work_project.rb @@ -1,6 +1,6 @@ class StudentWorkProject < ActiveRecord::Base # attr_accessible :title, :body - belongs_to :homework_common + belongs_to :homework_common,touch:true belongs_to :student_work belongs_to :project belongs_to :user