rge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange

app/services/syllabuses_service.rb

@@ -47,8 +47,8 @@ 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.each do |syllabus|
-      syllabus.courses = syllabus.courses.not_deleted
+    syllabuses.each do |syllabus|
+      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
@@ -111,7 +111,7 @@ class SyllabusesService
       syllabus_title = option[:title]
 
       sy.title = syllabus_title
-
+      sy.save!
       #修改班级名称
       modify_courses = option[:modify_courses]
       modify_courses.each do |c|

public/assets/wechat/class_list.html

@@ -5,7 +5,7 @@
     <div ng-repeat="syllabus in syllabuses">
         <div ng-click="syllabus.show_plus = !syllabus.show_plus" class="course-list-row f13 c-grey3 mt10"><img src="/images/wechat/plus.png" ng-show="syllabus.show_plus" width="15" class="fl ml10 mt11 spread-btn" /><img src="/images/wechat/minus.png" ng-show="!syllabus.show_plus" width="15" class="fl ml10 mt11 retract-btn " /><span class="fl ml10">{{syllabus.title}}</span><img src="/images/wechat/setting.png" ng-show = "syllabus.can_setting" width="15" class="fr mr10 mt10" ng-click="onSetting(syllabus)" /></div>
         <ul ng-show="!syllabus.show_plus" class="class-list f13 c-grey3">
-            <li ng-click="goClass(course.id)" ng-repeat="course in syllabus.courses" ng-class="{'border-bottom-none': $last}">
+            <li ng-show="course.id" ng-click="goClass(course.id)" ng-repeat="course in syllabus.courses" ng-class="{'border-bottom-none': $last}">
                 <img src="/images/wechat/dot.png" width="15px" class="class-list-dot" />
                 <span class="fl ml10 class-list-name hidden">{{course.name}}</span>
                 <span class="fr c-grey4">&gt;</span>