diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 46b3964c2..ef30dac83 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -127,21 +127,21 @@ class AccountsController < ApplicationController # UserDayCertification.create(user_id: user.id, status: 1) end - def set_autologin_cookie(user) - token = Token.get_or_create_permanent_login_token(user, "autologin") - cookie_options = { - :value => token.value, - :expires => 1.month.from_now, - :path => '/', - :secure => false, - :httponly => true - } - if edu_setting('cookie_domain').present? - cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain')) - end - cookies[autologin_cookie_name] = cookie_options - logger.info("cookies is #{cookies}") - end + # def set_autologin_cookie(user) + # token = Token.get_or_create_permanent_login_token(user, "autologin") + # cookie_options = { + # :value => token.value, + # :expires => 1.month.from_now, + # :path => '/', + # :secure => false, + # :httponly => true + # } + # if edu_setting('cookie_domain').present? + # cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain')) + # end + # cookies[autologin_cookie_name] = cookie_options + # logger.info("cookies is #{cookies}") + # end def logout UserAction.create(action_id: User.current.id, action_type: "Logout", user_id: User.current.id, :ip => request.remote_ip) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index b6bba1f34..459ba5384 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -620,6 +620,22 @@ class ApplicationController < ActionController::Base cookies[:fileDownload] = true end + def set_autologin_cookie(user) + token = Token.get_or_create_permanent_login_token(user, "autologin") + cookie_options = { + :value => token.value, + :expires => 1.month.from_now, + :path => '/', + :secure => false, + :httponly => true + } + if edu_setting('cookie_domain').present? + cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain')) + end + cookies[autologin_cookie_name] = cookie_options + logger.info("cookies is #{cookies}") + end + # 149课程的评审用户数据创建（包含创建课堂学生） def open_class_user user = User.find_by(login: "OpenClassUser") diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index 4a087ae7a..be8173b2f 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -476,10 +476,13 @@ class GamesController < ApplicationController if @myshixun.shixun.try(:status) < 2 tip_exception("代码获取异常，请检查实训模板的评测设置是否正确") else - # 报错继续retry tip_exception(-3, "#{e.message}") end end + # 如果报错了，并且retry 为1的时候，则fork一个新的仓库 + if params[:retry].to_i == 1 + project_fork(@myshixun, @shixun.repo_path, current_user.login) + end tip_exception(0, e.message) end end diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index 5ae96d046..81fc5ddc4 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -86,13 +86,13 @@ class Trainingjobsetting extends Component { latepenaltytype: false, unifiedsetting: true, allowreplenishment: undefined, - completionefficiencyscore: true, + completionefficiencyscore: false, whethertopay: false, proportion: undefined, level: undefined, ealuation: false, latededuction: undefined, - latedeductiontwo: "20", + latedeductiontwo: "0", database: false, datasheet: false, databasetwo: undefined, @@ -123,6 +123,7 @@ class Trainingjobsetting extends Component { end_timebool:false, late_timesbool:false, + work_efficiencys:false, } // console.log("获取到的值") // console.log("Trainingjobsetting") @@ -284,7 +285,7 @@ class Trainingjobsetting extends Component { allowreplenishment: result.data.allow_late, latededuction: result.data.late_penalty, level: result.data.answer_open_evaluation === true ? "满分" : "扣分", - completionefficiencyscore: result.data.work_efficiency, + work_efficiencys: result.data.work_efficiency, latedeductiontwo: result.data.eff_score, proportion: result.data.shixun_evaluation === 0 ? "均分比例" : result.data.shixun_evaluation === 1 ? "经验值比例" : result.data.shixun_evaluation === 2 ? "自定义分值" : "", publicwork: result.data.work_public, @@ -660,7 +661,7 @@ class Trainingjobsetting extends Component { flagPageEditsthrees:false, flagPageEditsfor:false, whethertopay:false, - completionefficiencyscore:true, + completionefficiencyscore:false, }) this.refs.targetElementTrainingjobsetting.scrollIntoView() @@ -1736,7 +1737,7 @@ class Trainingjobsetting extends Component { hand__e_tip: "", hand_flags: false, handclass: undefined, - completionefficiencyscore:true, + completionefficiencyscore:false, latedeductiontwo:0, unit_e_tip: "", }) @@ -1852,7 +1853,7 @@ class Trainingjobsetting extends Component { const dataformat = 'YYYY-MM-DD HH:mm'; - let {flagPageEdit,testscripttiptype,publish_timebool,end_timebool,late_timesbool,flagPageEdits,flagPageEditstwo,flagPageEditsbox,whethertopay,handclass,flagPageEditsthrees, flagPageEditsfor,rules,rulest,unifiedsetting,group_settings, course_group,unit_e_tip, borreds,borredss,unit_p_tip, end_time, late_time, score_open, publish_time, starttimetype, modalsType, modalsTopval, loadtype, modalSave, endtimetype, latetimetype, allowlate, latepenaltytype, jobsettingsdata, endOpen, mystyle, mystyles} = this.state; + let {flagPageEdit,testscripttiptype,publish_timebool,end_timebool,late_timesbool,work_efficiencys,flagPageEdits,flagPageEditstwo,flagPageEditsbox,whethertopay,handclass,flagPageEditsthrees, flagPageEditsfor,rules,rulest,unifiedsetting,group_settings, course_group,unit_e_tip, borreds,borredss,unit_p_tip, end_time, late_time, score_open, publish_time, starttimetype, modalsType, modalsTopval, loadtype, modalSave, endtimetype, latetimetype, allowlate, latepenaltytype, jobsettingsdata, endOpen, mystyle, mystyles} = this.state; console.log(publish_timebool); console.log(!flagPageEditstwo); const radioStyle = { @@ -1880,8 +1881,8 @@ class Trainingjobsetting extends Component { // } // console.log(this.props.isAdmin()) // console.log(this.state.code_review===false) - console.log("引入的分值"); - console.log(this.state.completionefficiencyscore); + // console.log("引入的分值"); + // console.log(this.state.work_efficiencys); return (
{this.state.showmodel===true? 效率分效率分(选中，则学生最终成绩包含效率分)