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();