From c2166811eb588fd038e36f6c19e48378d0198825 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Fri, 8 Jul 2016 17:35:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E7=95=8C=E9=9D=A2=E5=88=B7=E6=96=B0=E6=98=BE=E7=A4=BA?=
 =?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/api/mobile/apis/syllabuses.rb             |  2 +-
 .../wechat/controllers/edit_class.js          | 19 +++++++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/api/mobile/apis/syllabuses.rb b/app/api/mobile/apis/syllabuses.rb
index 682929a90..57db4cb9e 100644
--- a/app/api/mobile/apis/syllabuses.rb
+++ b/app/api/mobile/apis/syllabuses.rb
@@ -28,7 +28,7 @@ module Mobile
           ss  = SyllabusesService.new
 
           sy = ::Syllabus.find(params[:id])
-
+          sy.courses = sy.courses.not_deleted
           sy = ss.judge_can_setting(sy,current_user)
 
           present :data, sy, with: Mobile::Entities::Syllabus
diff --git a/public/javascripts/wechat/controllers/edit_class.js b/public/javascripts/wechat/controllers/edit_class.js
index 2e802ccd3..5f377e594 100644
--- a/public/javascripts/wechat/controllers/edit_class.js
+++ b/public/javascripts/wechat/controllers/edit_class.js
@@ -10,18 +10,25 @@ app.controller('EditClassController', ['$scope', '$http', 'auth', 'config', 'ale
         $http.get(config.apiUrl+"syllabuses/"+syllabus_id+"?token="+auth.token()).then(function(response){
             console.log(response.data);
             vm.syllabus = response.data.data;
+            if (vm.syllabus) {
+                for (var i in vm.syllabus.courses) {
+                    var course = vm.syllabus.courses[i];
+                    course.tmpname = course.name;
+                }
+                vm.syllabus.tmptitle = vm.syllabus.title;
+            }
         });
     }
     console.log(vm.syllabus);
 
     //名字用两份
-    for(var i in vm.syllabus.courses){
-        var course = vm.syllabus.courses[i];
-        course.tmpname = course.name;
+    if (vm.syllabus) {
+        for (var i in vm.syllabus.courses) {
+            var course = vm.syllabus.courses[i];
+            course.tmpname = course.name;
+        }
+        vm.syllabus.tmptitle = vm.syllabus.title;
     }
-    vm.syllabus.tmptitle = vm.syllabus.title;
-
-
     //单弹框
     vm.alertService_1 = alertService.create();