From f1f61c304a0feb741f58bd6aca7169092efa3055 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 8 Jul 2016 18:08:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E6=9C=89=E8=AF=AF=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/syllabuses_service.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/services/syllabuses_service.rb b/app/services/syllabuses_service.rb index 7bcc84e5b..b28b01412 100644 --- a/app/services/syllabuses_service.rb +++ b/app/services/syllabuses_service.rb @@ -47,6 +47,7 @@ class SyllabusesService syllabus_ids = courses.empty? ? '(-1)' : "(" + courses.map{|course| !course.syllabus_id.nil? && course.syllabus_id}.join(",") + ")" syllabuses = Syllabus.where("id in #{syllabus_ids} or user_id = #{user.id}").order("updated_at desc") + user.syllabuses = syllabuses user.syllabuses.each do |syllabus| syllabus.courses = syllabus.courses.not_deleted end From 1df13682141fad908c3264c65b48a0e4859f8931 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 8 Jul 2016 18:12:22 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=90=8D=E4=BF=AE=E6=94=B9=E6=97=A0=E6=95=88=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/syllabuses_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/syllabuses_service.rb b/app/services/syllabuses_service.rb index e4feb4ad1..b44e6e126 100644 --- a/app/services/syllabuses_service.rb +++ b/app/services/syllabuses_service.rb @@ -112,7 +112,7 @@ class SyllabusesService syllabus_title = option[:title] sy.title = syllabus_title - + sy.save! #修改班级名称 modify_courses = option[:modify_courses] modify_courses.each do |c| From 189e641d23a896d32f56c80642cbfb12c6808f8e Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 8 Jul 2016 18:32:30 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=94=B9=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/syllabuses_service.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/services/syllabuses_service.rb b/app/services/syllabuses_service.rb index b44e6e126..d0bf816ec 100644 --- a/app/services/syllabuses_service.rb +++ b/app/services/syllabuses_service.rb @@ -47,8 +47,7 @@ class SyllabusesService syllabus_ids = courses.empty? ? '(-1)' : "(" + courses.map{|course| !course.syllabus_id.nil? && course.syllabus_id}.join(",") + ")" syllabuses = Syllabus.where("id in #{syllabus_ids} or user_id = #{user.id}").order("updated_at desc") - user.syllabuses = syllabuses - user.syllabuses.each do |syllabus| + syllabuses.each do |syllabus| syllabus.courses = syllabus.courses.not_deleted end From 5ccde8e4338bc2882894b7f39a51f279d6725ffb Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 8 Jul 2016 18:52:21 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AF=B9=E7=9A=84?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/syllabuses_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/syllabuses_service.rb b/app/services/syllabuses_service.rb index d0bf816ec..b3190182c 100644 --- a/app/services/syllabuses_service.rb +++ b/app/services/syllabuses_service.rb @@ -48,7 +48,7 @@ class SyllabusesService syllabuses = Syllabus.where("id in #{syllabus_ids} or user_id = #{user.id}").order("updated_at desc") syllabuses.each do |syllabus| - syllabus.courses = syllabus.courses.not_deleted + syllabus.courses = courses.where("syllabus_id = #{syllabus.id}").select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").order("time desc") end syllabuses.to_a << other From f8eb150530afac82ffe54396920a93060f6fc354 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 8 Jul 2016 19:12:26 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=E4=B8=8D=E5=AE=8C=E6=88=90=E7=82=B9=E8=BF=94=E5=9B=9E=E7=8F=AD?= =?UTF-8?q?=E7=BA=A7=E4=BC=9A=E5=87=BA=E7=8E=B0=E5=86=8D=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/wechat/class_list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/assets/wechat/class_list.html b/public/assets/wechat/class_list.html index c1e1a2123..b215db763 100644 --- a/public/assets/wechat/class_list.html +++ b/public/assets/wechat/class_list.html @@ -5,7 +5,7 @@
{{syllabus.title}}