-
+
{datalist&&datalist.title}
{datalist&&datalist.attachment_histories.length===0?"":当前版本}
@@ -358,13 +358,13 @@ class Selectsetting extends Component{
{datalist&&datalist.attachment_histories.map((item,key)=>{
return(
-
+
{item.title}
{/*当前版本*/}
{item.downloads_count}
-
{item.quotes}
+ {/*
{item.quotes} */}
{moment(item.created_on).format('YYYY-MM-DD HH:mm')==="Invalid date"?"":moment(item.created_on).format('YYYY-MM-DD HH:mm')}
From 25fd4acd1559edaa2d3aa54dc23c024d831cef86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 15 Oct 2019 18:40:55 +0800
Subject: [PATCH 18/23] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/courses/Resource/Fileslistitem.js | 2 +-
.../react/src/modules/courses/coursesPublic/SelectSetting.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index d03018fd7..9d15062a6 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -336,7 +336,7 @@ class Fileslistitem extends Component{
-
+
:""}
{isRender===true?
-
{this.handleDialogClose()}}>
+
{this.handleDialogClose()}}>
From 4f847b2d14d25b1cf5441fa76cab35db7a3b5577 Mon Sep 17 00:00:00 2001
From: p31729568
Date: Tue, 15 Oct 2019 19:15:43 +0800
Subject: [PATCH 20/23] fix laboratory setting
---
app/models/laboratory.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/models/laboratory.rb b/app/models/laboratory.rb
index 53e66ece0..f319ace80 100644
--- a/app/models/laboratory.rb
+++ b/app/models/laboratory.rb
@@ -19,7 +19,7 @@ class Laboratory < ApplicationRecord
return if subdomain.blank?
rails_env = EduSetting.get('rails_env')
- subdomain = subdomain.slice(0, subdomain.size - rails_env.size - 1) if subdomain.end_with?(rails_env) # winse.dev => winse
+ subdomain = subdomain.slice(0, subdomain.size - rails_env.size - 1) if rails_env && subdomain.end_with?(rails_env) # winse.dev => winse
find_by_identifier(subdomain)
end
From 9ca786dfeaa2cf5cb269bad97aa509ead91f5b10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 15 Oct 2019 19:17:03 +0800
Subject: [PATCH 21/23] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/modules/courses/shixunHomework/Trainingjobsetting.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index fa0cdd832..b3b79ae28 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -1725,7 +1725,7 @@ class Trainingjobsetting extends Component {
flagPageEditstwo:releasetime,
flagPageEditsthrees:deadline,
flagPageEditsfor:endtime,
- completionefficiencyscore:true,
+ completionefficiencyscore:false,
work_efficiencys:this.state.work_efficiencys,
unifiedsetting:this.state.unifiedsetting,
latedeductiontwo:this.state.latedeductiontwo,
@@ -1841,7 +1841,7 @@ class Trainingjobsetting extends Component {
flagPageEditstwo:releasetime,
flagPageEditsthrees:deadline,
flagPageEditsfor:endtime,
- completionefficiencyscore:true,
+ completionefficiencyscore:datas.data.work_efficiency===true?true:false,
work_efficiencys:datas.data.work_efficiency,
unifiedsetting:datas.data.unified_setting,
latedeductiontwo:datas.data.eff_score,
From 20b6db26d24431c9f76f28c359c3b38e36fbba97 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 15 Oct 2019 19:50:55 +0800
Subject: [PATCH 22/23] =?UTF-8?q?=20=20//=20=E5=BE=85=E5=AE=A1=E6=89=B9?=
=?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/courses/members/teacherList.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js
index fe46e9bf4..bc534c61d 100644
--- a/public/react/src/modules/courses/members/teacherList.js
+++ b/public/react/src/modules/courses/members/teacherList.js
@@ -200,7 +200,8 @@ function buildColumns(that) {
},
})
}
- if(isAdminOrTeacher && hasGraduationModule) {
+ // 待审批不需要
+ if(filterKey == '1' && isAdminOrTeacher && hasGraduationModule) {
columns.unshift({
title: '',
dataIndex: 'course_member_id',
From ff90138997fb1d536709b12eb5727630b17c36e6 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Wed, 16 Oct 2019 09:52:31 +0800
Subject: [PATCH 23/23] =?UTF-8?q?=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/modules/tpm/challengesnew/TPMMDEditor.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
index 5d54f514b..2e6184428 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
@@ -131,7 +131,7 @@ function create_editorMD(id, width, high, placeholder, imageUrl, callback, initV
// Or return editormd.toolbarModes[name]; // full, simple, mini
// Using "||" set icons align right.
- const icons = ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"];
+ const icons = ["bold", "italic", "|", "list-ul", "list-ol", "|", "code", "code-block", "link", "|", "testIcon", "testIcon1", '|', "image", "table", '|', "watch", "clear"];
if (__that.props.showNullButton) {
icons.push('nullBtton')
}