Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop

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])

app/views/challenges/edit.html.erb

@@ -39,7 +39,7 @@
           <a href="<%= edit_shixun_challenge_path(@prev_challenge, :shixun_id => @shixun) %>" class="shixun-task-btn task-btn-green fr ml10">上一阶段</a>
       <% end %>
       <% if @shixun.status == 0 && User.current.manager_of_shixun?(@shixun) %>
-<!--          <a href="<%#= new_shixun_challenge_path(@shixun) %>" class="shixun-task-btn task-btn-green fr">新建阶段</a>-->
+          <!--          <a href="<%#= new_shixun_challenge_path(@shixun) %>" class="shixun-task-btn task-btn-green fr">新建阶段</a>-->
           <a href="<%= new_shixun_challenge_path(@shixun, :st => 0) %>" class="shixun-task-btn task-btn-green fr">+实践任务</a>
           <a href="<%= new_shixun_challenge_path(@shixun, :st => 1) %>" class="shixun-task-btn task-btn-green fr mr10">+多选任务</a>
           <a href="<%= new_shixun_challenge_path(@shixun, :st => 2) %>" class="shixun-task-btn task-btn-green fr mr10">+单选任务</a>
@@ -58,7 +58,7 @@
     <li class="fl <%= @tab == 3 ? "check_nav" : "" %>">
       <a href="<%= edit_shixun_challenge_path(@challenge, :shixun_id => @shixun, :tab => 3) %>" class="color-black">参考答案</a>
     </li>
-<!--    <li class="fl <%#= @tab == 6 ? "check_nav" : "" %>">
+    <!--    <li class="fl <%#= @tab == 6 ? "check_nav" : "" %>">
       <a href="<%#= edit_shixun_challenge_path(@challenge, :shixun_id => @shixun, :tab => 6) %>" class="color-black">预备知识</a>
     </li>-->
     <li class="fl <%= @tab == 4 ? "check_nav" : "" %>">
@@ -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 %>
   </div>
 </div>
 <div class="save-tip">
   <div class="save-tip-content">已保存</div>
-</div>
+</div>
+<script>
+    $(function(){
+        <% if notice %>
+        <% notice = nil %>
+        $(".save-tip").show();
+        <% end %>
+        setTimeout(function(){
+            $(".save-tip").hide();
+        }, 2000)
+
+    })
+</script>

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();

app/views/layouts/base_shixun.html.erb

@@ -45,7 +45,9 @@
     </div>
     <%#= render_flash_messages %>
     <div class="task-pm-content">
+      <% if !(params[:tab].to_i == 5 && params[:action] == "edit") %>
       <%= render_flash_messages %>
+      <% end %>
       <%= yield %>
     </div>
     <%= call_hook :view_layouts_base_content %>