From 8827c75d52516797d2be5de6b681151b113677a0 Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Wed, 6 Nov 2019 10:18:59 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/page/readme.txt | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/page/readme.txt b/public/react/src/modules/page/readme.txt index 882c48ee5..f5e5646e9 100644 --- a/public/react/src/modules/page/readme.txt +++ b/public/react/src/modules/page/readme.txt @@ -1,5 +1,5 @@ state说明 - tasks详情接口 + 顶层state--tasks详情接口 allowed_unlock 为true时，才允许非管理员用户解锁隐藏测试集 discusses_count 总评论数 @@ -124,6 +124,28 @@ state说明 user 当前关卡所属用户的信息 user_praise 当前用户是否点赞 + /MainContentContainer 里的state + repositoryCode: '', + open: false, // 繁忙等级等提示用Dialog，考虑重构封装到根组件 + gameBuilding: false, // 评测中标志 + codeStatus: SAVED, // 0 已修改 1 保存中 2 已保存 3 保存失败 + + codeLoading: true, // code加载中 + readRepoTimeout: false, // 加载代码轮训超时 + resetCodeDialogOpen: false, // 重新加载初始代码弹框的bool控制 + resetPassedCodeDialogOpen: false, // 重新加载上次通过的代码的bool控制 + + isEditablePath: true // 当前文件是否可编辑 + + CodeRepositoryViewContainer 里的state + drawerOpen: false, // 代码目录Drawer的bool控制 repoFilesDrawer + loadingFirstRepoFiles: false, // 代码目录树加载中的bool控制 + fileTreeData: "", // 目录树节点数据[] + fileTreeSelectedKeys: [], // 目录树被选择的节点的key + codeRepositoryViewExpanded: false, -- + tabIndex: 0, // tab值 + settingDrawerOpen: false // 设置面板Drawer的bool控制 + -------------- -------------- -------------- -------------- -------------- -------------- -------------- -------------- -------------- TPIContextProvider From 219ced5c2c65f97ed447db38d4b42ece24467484 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 6 Nov 2019 11:45:17 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/trustie_hacks_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/trustie_hacks_controller.rb b/app/controllers/trustie_hacks_controller.rb index ebc7f1578..f427caf72 100644 --- a/app/controllers/trustie_hacks_controller.rb +++ b/app/controllers/trustie_hacks_controller.rb @@ -10,7 +10,7 @@ class TrustieHacksController < ApplicationController limit = params[:limit] || 16 hacks = @hackathon.trustie_hacks - @hackathon_users_count = hacks.sum(:hack_users_count) + @hackathon_users_count = hacks ? 0 : hacks.sum(:hack_users_count) @hacks = hacks.page(page).per(limit) From a60ce17d966473c330a80f105bb3228938880ceb Mon Sep 17 00:00:00 2001 From: p31729568 Date: Wed, 6 Nov 2019 11:50:21 +0800 Subject: [PATCH 3/5] competition certificate download --- app/controllers/competitions/certificates_controller.rb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/controllers/competitions/certificates_controller.rb b/app/controllers/competitions/certificates_controller.rb index 68dad41c1..7572d8bbb 100644 --- a/app/controllers/competitions/certificates_controller.rb +++ b/app/controllers/competitions/certificates_controller.rb @@ -1,6 +1,11 @@ class Competitions::CertificatesController < Competitions::BaseController def personal - prize_user = CompetitionPrizeUser.find_by!(user: current_user, id: params[:id]) + prize_user = + if current_user.admin_or_business? + CompetitionPrizeUser.find(params[:id]) + else + CompetitionPrizeUser.find_by!(user: current_user, id: params[:id]) + end return render_not_found unless prize_user.certificate_exist? team = prize_user.competition_team @@ -12,7 +17,7 @@ class Competitions::CertificatesController < Competitions::BaseController def team team = CompetitionTeam.find(params[:id]) - return render_forbidden unless team.team_members.exists?(user_id: current_user.id) + return render_forbidden unless current_user.admin_or_business? || team.team_members.exists?(user_id: current_user.id) return render_not_found unless team.certificate_exists? prize = team.competition_prize_users.first.competition_prize From 9f3acd65b783f478d00c395da4fbfaa0e2e274ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Wed, 6 Nov 2019 12:12:01 +0800 Subject: [PATCH 4/5] =?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/common/educoder.js | 2 +- .../courses/coursesPublic/SelectResource.js | 2 +- .../courses/coursesPublic/SelectSetting.js | 2 +- .../courses/coursesPublic/sendResource.js | 2 +- public/react/src/modules/login/LoginDialog.js | 32 +++++----- .../modules/user/LoginRegisterComponent.js | 61 ++++++++++--------- 6 files changed, 54 insertions(+), 47 deletions(-) diff --git a/public/react/src/common/educoder.js b/public/react/src/common/educoder.js index 73c707c9b..004cd91c0 100644 --- a/public/react/src/common/educoder.js +++ b/public/react/src/common/educoder.js @@ -1,4 +1,4 @@ -import { from } from '_array-flatten@2.1.2@array-flatten'; +//import { from } from '_array-flatten@2.1.2@array-flatten'; // export { default as OrderStateUtil } from '../routes/Order/components/OrderStateUtil'; diff --git a/public/react/src/modules/courses/coursesPublic/SelectResource.js b/public/react/src/modules/courses/coursesPublic/SelectResource.js index edc1fc81b..13c201cd0 100644 --- a/public/react/src/modules/courses/coursesPublic/SelectResource.js +++ b/public/react/src/modules/courses/coursesPublic/SelectResource.js @@ -421,7 +421,7 @@ class Selectresource extends Component{ 立即发布 - + 延期发布 立即发布 - + 延期发布 立即发布 - + 延期发布 this.openweixinlogin()}> 微信登录 - this.openqqlogin()} className={"ml10"}> - qq登录 - + {/*this.openqqlogin()} className={"ml10"}>*/} + {/*qq登录*/} + {/**/} -

:

- - ———————— 快速登录 ———————— -

-

} +

:""} + + {/*

*/} + + {/*———————— 快速登录 ————————*/} + {/*

*/} + {/*

*/} } {weixinlogin===true?