From 8236f80461736398a6cc5b13f7b02c899ecb86fd Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 13 Dec 2019 20:07:05 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E7=9A=84=E5=AE=9E=E8=AE=AD=E5=92=8C=E5=AE=9E=E8=B7=B5=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=B7=B2=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/users/shixun_service.rb | 2 +- app/services/users/subject_service.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/services/users/shixun_service.rb b/app/services/users/shixun_service.rb index ef399ce8c..279d147f4 100644 --- a/app/services/users/shixun_service.rb +++ b/app/services/users/shixun_service.rb @@ -44,7 +44,7 @@ class Users::ShixunService def user_policy_filter(relations) # 只有自己或者管理员才有过滤筛选及查看全部状态下实训功能 if self_or_admin? - relations = relations.where.not(status: -1) + relations = relations.where.not(status: -1).where(hidden: false) status_filter(relations) else relations.where(status: [2, 3], hidden: false) diff --git a/app/services/users/subject_service.rb b/app/services/users/subject_service.rb index 8a4fdce3b..53ff3f4b9 100644 --- a/app/services/users/subject_service.rb +++ b/app/services/users/subject_service.rb @@ -35,7 +35,7 @@ class Users::SubjectService def user_policy_filter(relations) # 只有自己或者管理员才有过滤筛选及查看全部状态下实训功能 if self_or_admin? - status_filter(relations) + status_filter(relations.unhidden) else relations.where(status: 2, hidden: false) end From 71651c71e9919a12b42976a5c06209c596573098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 13 Dec 2019 20:30:07 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/courses/coursesPublic/NewShixunModel.js | 2 +- .../react/src/modules/courses/coursesPublic/Newshixunmodel.css | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js index 52cf945a0..5ee763951 100644 --- a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js +++ b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js @@ -591,7 +591,7 @@ class NewShixunModel extends Component{ this.props.type==='shixuns'? ( item.is_jupyter===true? -
+

Jupyter

diff --git a/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css b/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css index b69c41e25..9bdf44e68 100644 --- a/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css +++ b/public/react/src/modules/courses/coursesPublic/Newshixunmodel.css @@ -391,7 +391,6 @@ text-align: center; border-radius:5px; border:1px solid #FF6802; - margin-top: 4px; } .myysljupytertest{ width:54px; From 5515697e3fe57f541a971732c5dd670d04c05453 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, 13 Dec 2019 20:30:42 +0800 Subject: [PATCH 3/8] =?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/tpm/TPMBanner.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js index ed89de173..bf13313fd 100644 --- a/public/react/src/modules/tpm/TPMBanner.js +++ b/public/react/src/modules/tpm/TPMBanner.js @@ -1223,7 +1223,7 @@ class TPMBanner extends Component { } - {this.props.identity < 8 && shixunsDetails.shixun_status != -1 && shixunsDetails.shixun_status != 0? + {this.props.identity < 5 && shixunsDetails.shixun_status != -1 && shixunsDetails.shixun_status != 0?
From 9a8430b236ee23e89df84244e5b7b52b0987ec16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 13 Dec 2019 20:34:31 +0800 Subject: [PATCH 4/8] =?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/search/searchc.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/search/searchc.css b/public/react/src/search/searchc.css index b35c499a0..a885f3a12 100644 --- a/public/react/src/search/searchc.css +++ b/public/react/src/search/searchc.css @@ -138,7 +138,7 @@ text-align: center; border-radius:5px; border:1px solid #FF6802; - margin-top: 4px; + margin-top: 3px; } .jupytertextp{ From 8a1eab7ee1dc50b1c6d0e160108ac23678665f12 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 13 Dec 2019 20:36:01 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E8=83=BD=E5=A4=8D=E5=88=B6=E5=85=AC=E5=BC=80?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/shixuns_controller.rb | 2 +- app/services/subjects/copy_subject_service.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index caa716f16..7eabb003d 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -206,7 +206,7 @@ class ShixunsController < ApplicationController @new_shixun = Shixun.new @new_shixun.attributes = @shixun.attributes.dup.except("id","user_id","visits","gpid","status", "identifier", "averge_star", "homepage_show","repo_name", "myshixuns_count", "challenges_count", - "can_copy", "created_at", "updated_at") + "can_copy", "created_at", "updated_at", "public") @new_shixun.user_id = User.current.id @new_shixun.averge_star = 5 @new_shixun.identifier = generate_identifier Shixun, 8 diff --git a/app/services/subjects/copy_subject_service.rb b/app/services/subjects/copy_subject_service.rb index 94157dc7b..f44191fda 100644 --- a/app/services/subjects/copy_subject_service.rb +++ b/app/services/subjects/copy_subject_service.rb @@ -60,7 +60,7 @@ class Subjects::CopySubjectService < ApplicationService shixun = stage_shixun.shixun to_shixun = Shixun.new to_shixun.attributes = shixun.attributes.dup.except('id', 'user_id', 'identifier', 'homepage_show', - 'use_scope', 'averge_star', 'myshixuns_count', 'challenges_count') + 'use_scope', 'averge_star', 'myshixuns_count', 'challenges_count', "public") to_shixun.identifier = Util::UUID.generate_identifier(Shixun, 8) to_shixun.user_id = user.id if laboratory From 481f7503f5cb8468570314256b1992c67d9fa4ad 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, 13 Dec 2019 20:59:47 +0800 Subject: [PATCH 6/8] =?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/elearning/YslDetailCards.js | 1 + .../shixunHomework/ShixunhomeWorkItem.js | 6 +++++- .../src/modules/paths/PathDetail/Addshixuns.js | 17 +++++++++-------- .../modules/tpm/TPMsettings/Configuration.js | 15 +++++---------- .../src/modules/tpm/newshixuns/Newshixuns.js | 5 +++-- 5 files changed, 23 insertions(+), 21 deletions(-) diff --git a/public/react/src/modules/courses/elearning/YslDetailCards.js b/public/react/src/modules/courses/elearning/YslDetailCards.js index 55bed2b5e..6ca63a42a 100644 --- a/public/react/src/modules/courses/elearning/YslDetailCards.js +++ b/public/react/src/modules/courses/elearning/YslDetailCards.js @@ -529,6 +529,7 @@ class YslDetailCards extends Component{ { this.props.isAdmin()===true? {this.props.isAdmin?this.stopPro(event)} className={this.props.isAdminOrCreator()?"homepagePostSetting homepagePostSettingname":"homepagePostSetting homepagePostSettingbox"} style={{"right":"-2px","top":"6px","display":"block"}}> - {discussMessage&&discussMessage.shixun_status>1?实训详情:""} + {discussMessage&&discussMessage.shixun_status>1?实训详情: + 实训详情} {this.props.isAdminOrCreator()?this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"btn colorblue ml20 font-16 fontweight400"}>重命名:""} {/* 设置*/} 设置 diff --git a/public/react/src/modules/paths/PathDetail/Addshixuns.js b/public/react/src/modules/paths/PathDetail/Addshixuns.js index 634ce281f..a4819ed76 100644 --- a/public/react/src/modules/paths/PathDetail/Addshixuns.js +++ b/public/react/src/modules/paths/PathDetail/Addshixuns.js @@ -69,6 +69,7 @@ class Addshixuns extends Component { labelCol: { span: 4 }, wrapperCol: { span: 14 }, }; + console.log(this.props) return( :""}
-
- - - 普通实训 - jupyter实训 - - -
+ {/*
*/} + {/* */} + {/* */} + {/* 普通实训*/} + {/* jupyter实训*/} + {/* */} + {/* */} + {/*
*/}

实训名称： diff --git a/public/react/src/modules/tpm/TPMsettings/Configuration.js b/public/react/src/modules/tpm/TPMsettings/Configuration.js index 79f253191..070f5b156 100644 --- a/public/react/src/modules/tpm/TPMsettings/Configuration.js +++ b/public/react/src/modules/tpm/TPMsettings/Configuration.js @@ -121,8 +121,9 @@ export default class Shixuninformation extends Component { } onSubmits = () => { - let {can_copy, use_scope, scope_partment, opening_time,oldscope_partment} = this.state; + + if(this.state.opentime===true){ if(opening_time===null){ this.setState({ @@ -143,9 +144,7 @@ export default class Shixuninformation extends Component { let id = this.props.match.params.shixunId; let url = `/shixuns/${id}/update_permission_setting.json`; - this.setState({ - loading: true - }) + axios.post(url, { scope_partment: list, @@ -168,14 +167,10 @@ export default class Shixuninformation extends Component { this.props.getdatas("3") } }).catch((error) => { - this.setState({ - loading: false - }) + }) - this.setState({ - loading: false - }) + } CheckboxonChange = (e) => { this.setState({ diff --git a/public/react/src/modules/tpm/newshixuns/Newshixuns.js b/public/react/src/modules/tpm/newshixuns/Newshixuns.js index c2ec0d5ef..8355efb52 100644 --- a/public/react/src/modules/tpm/newshixuns/Newshixuns.js +++ b/public/react/src/modules/tpm/newshixuns/Newshixuns.js @@ -431,6 +431,7 @@ class Newshixuns extends Component { return isLt150M; }, } + return (