Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/controllers/add_school_applies_controller.rb

@@ -1,5 +1,5 @@
 class AddSchoolAppliesController < ApplicationController
-  before_action :require_login, :check_auth
+  before_action :require_login
 
   def create
     school = CreateAddSchoolApplyService.call(current_user, create_params)

app/controllers/homework_commons_controller.rb

@@ -38,7 +38,7 @@ class HomeworkCommonsController < ApplicationController
       tip_exception("子目录id有误") if !@category.present?
       @homework_commons = @homework_commons.where(course_second_category_id: params[:category])
     elsif @homework_type == 4
-      @homework_commons = @homework_commons.where(course_second_category_id: 0)
+      @homework_commons = @homework_commons
     end
     @all_count = @homework_commons.size
 

app/helpers/courses_helper.rb

@@ -199,7 +199,8 @@ module CoursesHelper
 
   # 获取课堂的作业数
   def get_homework_commons_count(course, type, category_id)
-    HomeworkCommon.where(course_id: course.id, homework_type: type, course_second_category_id: category_id).size
+    category_id == 0 ? HomeworkCommon.where(course_id: course.id, homework_type: type).size :
+      HomeworkCommon.where(course_id: course.id, homework_type: type, course_second_category_id: category_id).size
   end
 
 

public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js

@@ -505,7 +505,7 @@ class Coursesleftnav extends Component{
     }else  if(NavmodalValue.length>20){
       this.setState({
         NavmodalValuetype:true,
-        NavmodalValues:"名称不能超过20个字"
+        NavmodalValues:"名称不能超过60个字"
       })
       return
     }

public/react/src/modules/paths/PathDetail/DetailCards.js

@@ -469,7 +469,7 @@ class DetailCards extends Component{
                                         {
                                           showparagraphkey===key&&showparagraphindex===index?<div>
                                             <Link to={'/shixuns/'+line.identifier+'/challenges'} className="mr30 color-blue_4C shixun_detail pointer fl" target="_blank">查看详情</Link>
-                                            <a  onClick={()=>this.startgameid(line.identifier)} className="btn_auto user_bluebg_btn fl" id="shixun_operation" >开始实战</a>
+																						{line.shixun_status==="暂未公开"?"":<a  onClick={()=>this.startgameid(line.identifier)} className="btn_auto user_bluebg_btn fl" id="shixun_operation" >开始实战</a>}
                                           </div>:""
                                         }