From cbc100f8e1112b2a3917d35265d1a9de48816ce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 15 Aug 2019 10:05:29 +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/Resource/Fileslistitem.js |  2 +-
 .../tasks/GraduationTasksSubmitnew.js         | 20 ++++++++++++++++---
 .../shixunHomework/Listofworksstudentone.js   | 12 +++++------
 .../courses/shixunHomework/shixunHomework.js  |  5 +++--
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index c3998700f..c6c398ca3 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -263,7 +263,7 @@ class Fileslistitem extends Component{
 
                     <p className="color-grey panel-lightgrey mt8 fl ml30" style={{width:'100%'}}>
                       <span className="mr50">
-                        <span className="mr15 color-dark">{discussMessage.author.login}</span>
+                        <span className="mr15 color-dark">{discussMessage.author.name}</span>
                         <span className="mr15 color-grey9">大小 {discussMessage.filesize}</span>
                         <span className="mr15 color-grey9">下载 {discussMessage.downloads_count}</span>
                         <span className="mr15 color-grey9">引用 {discussMessage.quotes}</span>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index f5060ad4c..a9dd5bc13 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
@@ -439,10 +439,24 @@ class GraduationTasksSubmitnew extends Component{
           ).then((response) => {
             this.setState({
               spinnings:false
-            })
-            if(response!==undefined){
-              this.goback()
+            });
+            // /courses/2915/graduation_tasks/1301/appraise
+            // window.location.href
+            if(response){
+              if(response.data){
+                if(response.data.work_id){
+                  window.location.href=`/courses/${this.props.match.params.coursesId}/graduation_tasks/${response.data.work_id}/appraise`
+                }
+              }
             }
+            // console.log(this.props);
+            // console.log(response);
+
+            // 新需求
+            // https://www.trustie.net/issues/23015
+            // if(response!==undefined){
+            //   this.goback()
+            // }
             // if(response.status===200) {
             //   GraduationTasksnewtype=false;
             //   if(response.data.status===0){
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 7f821bde4..6b756ad8f 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -367,9 +367,9 @@ class Listofworksstudentone extends Component {
 					render: (text, record) => (
 						<span>
                         {
-													record.submitstate === "未提交" ?<span style={{	color: '#9A9A9A'}}>--</span>
+													record.submitstate === "未提交" ?<span style={{	color: '#9A9A9A',cursor:"default"}}>--</span>
 														:
-														<span style={{"text-align": "center"}}
+														<span style={{textAlign: "center",cursor:"default"}}
 																	className="color-blue"
 																	onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</span>
 												}
@@ -691,9 +691,9 @@ class Listofworksstudentone extends Component {
 					align: 'center',
 					className:'font-14',
 					render: (text, record) => (
-						record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A'}}>--</span> :
+						record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A',cursor:"default"}}>--</span> :
 							<span>
-                       <a style={{"text-align": "center"}} className="color-blue"
+                       <a style={{textAlign: "center",cursor:"default"}} className="color-blue"
 													onClick={() => this.Viewstudenttraininginformationt(record)}>{record.operating}</a>
         </span>
 					)
@@ -985,9 +985,9 @@ class Listofworksstudentone extends Component {
 					align: 'center',
 					className:'font-14',
 					render: (text, record) => (
-						record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A'}}>--</span> :
+						record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A',cursor:"default"}}>--</span> :
 							<span>
-                       <a style={{"text-align": "center"}} className="color-blue"
+                       <a style={{textAlign: "center",cursor:"default"}} className="color-blue"
 													onClick={() => this.Viewstudenttraininginformationt(record)}>{record.operating}</a>
         </span>
 					)
diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
index 48c988114..f07380d77 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
@@ -1018,8 +1018,9 @@ class ShixunHomework extends Component{
         <div className="edu-back-white">
           <p className="clearfix padding30 bor-bottom-greyE">
             <p style={{height: '20px'}}>
-            <span className="font-18 fl color-dark-21">{datas&&datas.category_name===undefined||datas&&datas.category_name===null?datas&&datas.main_category_name:datas&&datas.category_name+" 作业列表"}</span>
-            <li className="fr">
+            {/*<span className="font-18 fl color-dark-21">{datas&&datas.category_name===undefined||datas&&datas.category_name===null?datas&&datas.main_category_name:datas&&datas.category_name+" 作业列表"}</span>*/}
+              <span className="font-18 fl color-dark-21">实训作业</span>
+              <li className="fr">
               {this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?
                   <span>
                     <WordsBtn style="blue" onClick={()=>this.addDir()} className={"mr30 font-16"}>添加目录</WordsBtn>

From 9d8ed2f292b188a31c6cd12704759b45c1f0c440 Mon Sep 17 00:00:00 2001
From: p31729568 <winse.wang@foxmail.com>
Date: Thu, 15 Aug 2019 10:15:03 +0800
Subject: [PATCH 2/2] fix es search course teacher not exist

---
 app/models/searchable/course.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/searchable/course.rb b/app/models/searchable/course.rb
index 93c69c9e8..0b2b78436 100644
--- a/app/models/searchable/course.rb
+++ b/app/models/searchable/course.rb
@@ -21,8 +21,8 @@ module Searchable::Course
   def to_searchable_json
     {
       id: id,
-      author_name: teacher.real_name,
-      author_school_name: teacher.school_name,
+      author_name: teacher&.real_name,
+      author_school_name: teacher&.school_name,
       visits_count: visits,
       members_count: members_count,
       is_public: is_public == 1