From 2435342ae91136272a5927cec143609c6fd6a0fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 11 Oct 2019 14:34:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/shixunHomework/ShixunhomeWorkItem.js    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index 8b63a3471..be138996f 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/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>
                 }
                 

From 938b974d772cb299084a48d7ced8f7446d1d9d22 Mon Sep 17 00:00:00 2001
From: SylorHuang <sylor_huang@126.com>
Date: Fri, 11 Oct 2019 14:34:57 +0800
Subject: [PATCH 2/2] check commit_method

---
 app/controllers/exercises_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb
index e76148f20..f74eefabf 100644
--- a/app/controllers/exercises_controller.rb
+++ b/app/controllers/exercises_controller.rb
@@ -1078,6 +1078,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)