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 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{

- {discussMessage.author.login} + {discussMessage.author.name} 大小 {discussMessage.filesize} 下载 {discussMessage.downloads_count} 引用 {discussMessage.quotes} 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) => ( { - record.submitstate === "未提交" ?-- + record.submitstate === "未提交" ?-- : - this.Viewstudenttraininginformation(record)}>{record.operating} } @@ -691,9 +691,9 @@ class Listofworksstudentone extends Component { align: 'center', className:'font-14', render: (text, record) => ( - record.submitstate === "未提交" ? -- : + record.submitstate === "未提交" ? -- : - this.Viewstudenttraininginformationt(record)}>{record.operating} ) @@ -985,9 +985,9 @@ class Listofworksstudentone extends Component { align: 'center', className:'font-14', render: (text, record) => ( - record.submitstate === "未提交" ? -- : + record.submitstate === "未提交" ? -- : - this.Viewstudenttraininginformationt(record)}>{record.operating} ) 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{

- {datas&&datas.category_name===undefined||datas&&datas.category_name===null?datas&&datas.main_category_name:datas&&datas.category_name+" 作业列表"} -

  • + {/*{datas&&datas.category_name===undefined||datas&&datas.category_name===null?datas&&datas.main_category_name:datas&&datas.category_name+" 作业列表"}*/} + 实训作业 +
  • {this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null? this.addDir()} className={"mr30 font-16"}>添加目录