From bc352897ef26c30d4cf4b996206fc3c678f4b710 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 6 Apr 2017 15:19:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E2=80=9C=E4=BB=8E=E9=A2=98=E5=BA=93=E5=BC=95=E7=94=A8=E2=80=9D?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=EF=BC=8C=E6=9C=89=E6=97=B6=E5=A6=82=E5=9B=BE?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=8F=8F=E8=BF=B0=E6=A1=86=E4=B8=AD=E4=BC=9A?= =?UTF-8?q?=E5=87=BA=E7=8E=B0=E4=B8=80=E5=A4=A7=E7=89=87=E7=A9=BA=E7=99=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_select_homework.js.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/user_select_homework.js.erb b/app/views/users/user_select_homework.js.erb index b1ccdec20..1d06d2fed 100644 --- a/app/views/users/user_select_homework.js.erb +++ b/app/views/users/user_select_homework.js.erb @@ -1,5 +1,6 @@ //$("#HomeWorkCon").replaceWith("<%#= escape_javascript(render :partial => 'users/user_homework_form', :locals => { :homework => @homework,:edit_mode => true })%>"); hideModal('#coursesChoosePopup'); +$("#homework_editor").show(); $("#homework_name").val("<%= @homework.name%>"); //$("#homework_end_time").val("<%#= @homework.end_time%>"); <% if @select_course == "0"%> @@ -20,6 +21,5 @@ homework_description_editor.html("<%= escape_javascript(@homework.description.ht <% end %> document.getElementById("homework_type_option").options[<%=@homework.homework_type %>].selected = true; $("#select_type_nitice").hide(); -$("#homework_editor").show(); $("#join_bank").attr("checked",false); $("#join_bank_li").hide(); \ No newline at end of file From a5a99e7bcfe14d5e3c8c58c8c8a6f18c27f05f0f Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 7 Apr 2017 15:33:24 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=88=86=E7=BB=84?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E6=97=B6=E7=9B=B8=E5=85=B3=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=9C=AA=E5=88=A0=E5=AE=8C=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_work_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index a6f0cdd12..1d928bcdc 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -779,8 +779,8 @@ class StudentWorkController < ApplicationController course_statistics.update_attribute('committed_work_num', (course_statistics.committed_work_num - 1) < 0 ? 0 : (course_statistics.committed_work_num - 1)) if course_statistics course_statistics.update_attribute('un_commit_work_num', course_statistics.un_commit_work_num + 1) if course_statistics end - student_works.delete_all - pros.delete_all + student_works.destroy_all + pros.destroy_all project = @work.student_work_projects.where("is_leader = 1").first if @homework.homework_detail_group.base_on_project == 1