diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index d5eac556a..d12b1ba34 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -29,6 +29,7 @@ class GamesController < ApplicationController # @st 0 实践任务 1 多选任务 2 单选任务 def show # 展示全部实训 + @is_subject = params[:is_subject] if @game.status == 1 # 放置页面ajax数据还没获取就关闭 @game.update_attribute(:status, 0) diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb index 1c7aef02c..813c790b4 100644 --- a/app/controllers/myshixuns_controller.rb +++ b/app/controllers/myshixuns_controller.rb @@ -98,7 +98,7 @@ class MyshixunsController < ApplicationController raise("实训云平台繁忙（繁忙等级：87）") end end - redirect_to shixun_exec_shixun_path(shixun, :type => 1) + redirect_to shixun_exec_shixun_path(shixun, :type => 1, :is_subject => params[:is_subject]) rescue Exception => e flash[:error] = "实训云平台繁忙（繁忙等级：89）" g.delete_project(@myshixun.gpid) if !g_project.try(:id).nil? diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 07710ead0..c398d388c 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -384,7 +384,7 @@ class ShixunsController < ApplicationController myshixun = Myshixun.where(:user_id => User.current.id, :shixun_id => @shixun.id).first unless myshixun.blank? logger.info("current task id is #{myshixun.current_task}") - redirect_to myshixun_game_path(myshixun.current_task, :myshixun_id => myshixun) + redirect_to myshixun_game_path(myshixun.current_task, :myshixun_id => myshixun, :is_subject => params[:is_subject]) return end ActiveRecord::Base.transaction do @@ -436,7 +436,7 @@ class ShixunsController < ApplicationController raise("实训云平台繁忙（繁忙等级：81）") end logger.info("myshixun id si #{myshixun.id} and current_task id is#{myshixun.current_task.id}") - redirect_to myshixun_game_path(myshixun.current_task, :myshixun_id => myshixun) + redirect_to myshixun_game_path(myshixun.current_task, :myshixun_id => myshixun, :is_subject => params[:is_subject]) rescue Exception => e flash[:error] = e.message logger.info("failed to exec shixun: current task id is #{e}") diff --git a/app/views/challenges/_single_or_multiple_question_show.html.erb b/app/views/challenges/_single_or_multiple_question_show.html.erb index cc540b285..b4a528a8d 100644 --- a/app/views/challenges/_single_or_multiple_question_show.html.erb +++ b/app/views/challenges/_single_or_multiple_question_show.html.erb @@ -13,7 +13,7 @@ <% @challenge_choose.challenge_questions.each_with_index do |option, index| %>
  • -
    +
    <%= option.option_name %>
    • diff --git a/app/views/forums/forum_form_add.html b/app/views/forums/forum_form_add.html new file mode 100644 index 000000000..78240dfaa --- /dev/null +++ b/app/views/forums/forum_form_add.html @@ -0,0 +1,68 @@ + + + + + + + + + + + + + +
    +
    +
    +

    + + kosasa > 讨论 > 新建 +

    +
    +

    新建话题

    +
    +
    +
      + +
    • + + +

      标题不能超过60个字符

      +
      • +
    • + + + +

      内容不能为空

      +
      • +
    • +
      + + + + 上传附件 + +
      +
      • +
    • + 保存 + 取消 +
      • +
    +
    +
    +
    +
    + + diff --git a/app/views/forums/forum_form_detail.html b/app/views/forums/forum_form_detail.html new file mode 100644 index 000000000..ef849ed00 --- /dev/null +++ b/app/views/forums/forum_form_detail.html @@ -0,0 +1,116 @@ + + + + + + + + + + + + + +
    +
    +
    +

    + + kosasa > 讨论 > 新建 +

    +
    +

    五个值得推荐的英语学习网站，不可错过哦！

    +

    返回

    +
    +
    +
    +
    + 用户头像 +
    +

    创新使者

    +

    + 发表于1年前 +

    +
    + +
    + + +
    +
    +
    + + 上传文件 +
    + +
    +
    +
    +

    全部回复(1)

    +

    + 回复 + + + 赞 + 0 + + +

    +
    + + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    +
    + + + + diff --git a/app/views/forums/forum_form_list.html b/app/views/forums/forum_form_list.html new file mode 100644 index 000000000..c23f63efd --- /dev/null +++ b/app/views/forums/forum_form_list.html @@ -0,0 +1,143 @@ + + + + + + + + + + + + + +
    +
    +
    +

    + + kosasa > 讨论 +

    +
    +
    +
    + +
    +
  • 胡莎莎
    • +
  • P547687645213
    • +
    +
    +
      +
    • 983
      被赞
      • +
    • 983
      回复/评论
      • +
    • 983
      主题
      • +
    +
    +
    + +
    +
    +

    问吧

    + + 新话题 +
    +
    +
    + +
    + 华沙沙 +

    + 五个值得推荐的英语学习网站，不可错过哦！ +

    +

    1.练习口语 在线英语： http://dwz.cn/1XHGmL（免费在线口语课领取，外教一对一交流互动~） 特点：有正式课程挂网上公开，注册可免费听口语课，与外国老师实时交流哦~哈哈哈哈哈哈

    +

    + 10 + 10 + 10 + + 最后更新：2小时前 +

    + +
    + + +
    +
    +
    + +
    + +
    + 华沙沙 +

    + 五个值得推荐的英语学习网站，不可错过哦！ +

    +

    1.练习口语 在线英语： http://dwz.cn/1XHGmL（免费在线口语课领取，外教一对一交流互动~） 特点：有正式课程挂网上公开，注册可免费听口语课，与外国老师实时交流哦~哈哈哈哈哈哈

    +

    + 10 + 10 + 10 + + 最后更新：2小时前 +

    + +
    + + +
    +
    +
    + +
    + +
    + 华沙沙 +

    + 五个值得推荐的英语学习网站，不可错过哦！ +

    +

    1.练习口语 在线英语： http://dwz.cn/1XHGmL（免费在线口语课领取，外教一对一交流互动~） 特点：有正式课程挂网上公开，注册可免费听口语课，与外国老师实时交流哦~哈哈哈哈哈哈

    +

    + 10 + 10 + 10 + + 最后更新：2小时前 +

    + +
    + + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    +
    +
    +
    + + diff --git a/app/views/games/_choice_question.html.erb b/app/views/games/_choice_question.html.erb index 56b8bada4..8330ad846 100644 --- a/app/views/games/_choice_question.html.erb +++ b/app/views/games/_choice_question.html.erb @@ -27,7 +27,7 @@ name="answer[]" category="<%= choose.category %>" value="<%= (question.position + 65).chr %>" id="result_<%= index %>_<%= i %>" class="ml-3 mr5 magic-checkbox ml5"> <% end %> - +

    <% end %> diff --git a/app/views/homework_common/_homework_index_list.html.erb b/app/views/homework_common/_homework_index_list.html.erb index 4f9eea2b2..9c7692fa4 100644 --- a/app/views/homework_common/_homework_index_list.html.erb +++ b/app/views/homework_common/_homework_index_list.html.erb @@ -55,7 +55,7 @@

    <% if @is_teacher %> -
    +