diff --git a/app/controllers/challenges_controller.rb b/app/controllers/challenges_controller.rb index 7784f68a7..3b660b434 100644 --- a/app/controllers/challenges_controller.rb +++ b/app/controllers/challenges_controller.rb @@ -151,8 +151,7 @@ class ChallengesController < ApplicationController end end end - - redirect_to edit_shixun_challenge_path(@challenge, :shixun_id => @shixun, :tab => params[:tab]) + redirect_to edit_shixun_challenge_path(@challenge, :shixun_id => @shixun, :tab => params[:tab]), notice: 'Succeed' rescue Exception => e flash[:error] = "#{e.message}" redirect_to edit_shixun_challenge_path(@challenge, :shixun_id => @shixun, :tab => params[:tab]) diff --git a/app/views/challenges/edit.html.erb b/app/views/challenges/edit.html.erb index b8b155b07..412ff24f0 100644 --- a/app/views/challenges/edit.html.erb +++ b/app/views/challenges/edit.html.erb @@ -39,7 +39,7 @@ 上一阶段 <% end %> <% if @shixun.status == 0 && User.current.manager_of_shixun?(@shixun) %> - + +实践任务 +多选任务 +单选任务 @@ -58,7 +58,7 @@
  • "> 参考答案
  • -
  • "> @@ -79,11 +79,23 @@ <%= render :partial => "edit_scoring" %> <% elsif @tab == 5 %> <%= render :partial => "edit_skill" %> - <%# elsif @tab == 6 %> + <%# elsif @tab == 6 %> <%#= render :partial => "edit_propaedeutics" %> <% end %>
    已保存
    -
    \ No newline at end of file + + \ No newline at end of file diff --git a/app/views/games/refresh_game_list.js.erb b/app/views/games/refresh_game_list.js.erb index 19aa1a382..a7a15076b 100644 --- a/app/views/games/refresh_game_list.js.erb +++ b/app/views/games/refresh_game_list.js.erb @@ -1,3 +1,5 @@ -$("#all_task_tab").trigger("click"); // 模拟全部任务点击事件 +if($("#all_task_index").css("left") == "0px"){ + $("#all_task_tab").trigger("click"); // 模拟全部任务点击事件 +} $("#all_task_show").html("<%= j (render :partial => "games_list") %>"); hideModal(); \ No newline at end of file diff --git a/app/views/layouts/base_shixun.html.erb b/app/views/layouts/base_shixun.html.erb index 170293b43..bb4d8f7a8 100644 --- a/app/views/layouts/base_shixun.html.erb +++ b/app/views/layouts/base_shixun.html.erb @@ -45,7 +45,9 @@ <%#= render_flash_messages %>
    + <% if !(params[:tab].to_i == 5 && params[:action] == "edit") %> <%= render_flash_messages %> + <% end %> <%= yield %>
    <%= call_hook :view_layouts_base_content %>