Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/subjects_controller.rb

@@ -92,7 +92,7 @@ class SubjectsController < ApplicationController
     @is_creator = current_user.creator_of_subject?(@subject)
     @is_manager = @user.manager_of_subject?(@subject)
     # 合作团队
-    @shixuns = @subject.shixuns.published.pluck(:id)
+   # @shixuns = @subject.shixuns.published.pluck(:id)
     @courses = @subject.courses if @subject.excellent
     @members = @subject.subject_members.includes(:user)
 

app/helpers/subjects_helper.rb

@@ -1,10 +1,10 @@
 module SubjectsHelper
 
   # 实训路径的发布状态
-  def publish_status subject, is_manager, user, shixuns
+  def publish_status subject, is_manager, user
     status = -1
     if is_manager
-      status = 0 if subject.status == 0 && shixuns.count > 0
+      status = 0 if subject.status == 0
       status = 1 if subject.status == 1
       status = 2 if subject.status == 2 && user.admin?
     end

app/views/subjects/show.json.jbuilder

@@ -6,7 +6,7 @@ json.subject_score @subject.all_score
 json.member_count @subject.member_count
 
 json.allow_delete (@subject.status != 2 && @is_creator) || @user.admin?
-json.publish_status publish_status(@subject, @is_manager, @user, @shixuns)
+json.publish_status publish_status(@subject, @is_manager, @user)
 json.allow_statistics @is_manager
 json.allow_send @user.logged?
 json.allow_visit @subject.status > 1 || @is_manager