Merge branch 'dev_aliyun' into dev_cxt

app/controllers/exercises_controller.rb

@@ -689,7 +689,7 @@ class ExercisesController < ApplicationController
     # 可立即发布的分班：当前用户管理的分班去除已发布的分班
     group_ids = @course.charge_group_ids(@current_user) - @exercise.exercise_group_settings.exercise_group_published.pluck(:course_group_id)
     @course_groups = @course.course_groups.where(id: group_ids)
-    @group_settings = @exercise.exercise_group_settings.where(id: group_ids)
+    @group_settings = @exercise.exercise_group_settings.where(course_group_id: group_ids)
   end
 
   #首页批量或单独 立即发布,应是跳出弹窗，设置开始时间和截止时间。
@@ -1102,6 +1102,7 @@ class ExercisesController < ApplicationController
     ActiveRecord::Base.transaction do
       begin
         can_commit_exercise = false
+        Rails.logger.info("######____________params[:commit_method]_________################{params[:commit_method]}")
         if (@user_course_identity > Course::ASSISTANT_PROFESSOR) && params[:commit_method].present?  #为学生时
           if params[:commit_method].to_i == 2   #自动提交时
             user_left_time = get_exercise_left_time(@exercise,current_user)

app/controllers/homework_commons_controller.rb

@@ -1036,7 +1036,7 @@ class HomeworkCommonsController < ApplicationController
       # 可立即发布的分班：当前用户管理的分班去除已发布的分班
       group_ids = @course.charge_group_ids(@current_user) - @homework.homework_group_settings.group_published.pluck(:course_group_id)
       @course_groups = @course.course_groups.where(id: group_ids)
-      @group_settings = @homework.homework_group_settings.where(id: group_ids)
+      @group_settings = @homework.homework_group_settings.where(course_group_id: group_ids)
     else
       tip_exception("没有可发布的分班")
     end

app/controllers/polls_controller.rb

@@ -249,7 +249,7 @@ class PollsController < ApplicationController
     # 可立即发布的分班：当前用户管理的分班去除已发布的分班
     group_ids = @course.charge_group_ids(@current_user) - @poll.poll_group_settings.poll_group_published.pluck(:course_group_id)
     @course_groups = @course.course_groups.where(id: group_ids)
-    @group_settings = @poll.poll_group_settings.where(id: group_ids)
+    @group_settings = @poll.poll_group_settings.where(course_group_id: group_ids)
   end
 
   #首页批量或单独 立即发布,应是跳出弹窗，设置开始时间和截止时间。

public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js

@@ -354,8 +354,8 @@ class ShixunhomeWorkItem extends Component{
               <span className="mr50 df">
                 {/* <a href="/users/innov" className="panel-name-small hide fl mr15 mr30 color-grey3">{discussMessage.author.name}</a> */}
                 { discussMessage.author && <span className="mr15 color-grey-3">{discussMessage.author}</span> }
-								{discussMessage.commit_count===undefined?"":<span className="mr15 color-grey9">{discussMessage.commit_count} 已开始做题</span>}
-								{discussMessage.uncommit_count===undefined?"":<span className="mr15 color-grey9">{discussMessage.uncommit_count} 未开始做题</span>}
+								{discussMessage.commit_count===undefined?"":<span className="mr15 color-grey9">已开始做题：{discussMessage.commit_count}</span>}
+								{discussMessage.uncommit_count===undefined?"":<span className="mr15 color-grey9">未开始做题：{discussMessage.uncommit_count}</span>}
                 {/*<span className="mr15 color-grey9">{discussMessage.replies_count} 3 未评</span>*/}
 
                 {
@@ -381,7 +381,7 @@ class ShixunhomeWorkItem extends Component{
                 {
                   discussMessage && discussMessage.upper_category_name &&
                   <ConditionToolTip title={discussMessage.upper_category_name} condition={ discussMessage.upper_category_name.length > 22 }>
-                    { <span className="mr15 color-grey9 task-hide" style={discussMessage.time_status===1||discussMessage.time_status===2||discussMessage.time_status===3||discussMessage.time_status===4?{"maxWidth":"111px"}:{"maxWidth":"272px"}} title={discussMessage.upper_category_name}>{discussMessage.upper_category_name}</span>}
+                    { <span className="mr15 color-grey9 task-hide" style={discussMessage.time_status===1||discussMessage.time_status===2||discussMessage.time_status===3||discussMessage.time_status===4?{"maxWidth":"98px"}:{"maxWidth":"272px"}} title={discussMessage.upper_category_name}>{discussMessage.upper_category_name}</span>}
                   </ConditionToolTip>
                 }