Merge branch 'develop' into 'develop'

本周上线任务



See merge request !183

app/controllers/files_controller.rb

@@ -61,6 +61,7 @@ class FilesController < ApplicationController
     @sort = ""
     @order = ""
     @is_remote = true
+    @curr_page = params[:page] ? params[:page].to_i : 1
     @q = params[:name].strip
     if params[:sort]
       order_by = params[:sort].split(":")
@@ -274,6 +275,7 @@ class FilesController < ApplicationController
     @sort = ""
     @order = ""
     @is_remote = false
+    @curr_page = params[:page] ? params[:page].to_i : 1
     if params[:project_id]
       # 更新资源申请消息为已读
       # ar_ids = ApplyResource.where("user_id =? and container_id =? and container_type =?", User.current.id, params[:project_id].to_i, "Project").map{|ar| ar.id}

app/views/attachments/_show_attachment_history_delete.html.erb

@@ -14,6 +14,7 @@
 <script>
     function attachment_fresh_for_destroy(){
         hideModal();
+        $("#curr_page").val($("#curr_page_span").html());
         $(".re_search").submit();
     }
 </script>

app/views/files/_attachment_history_popub.html.erb

@@ -61,6 +61,7 @@
 <script>
   function attachment_fresh_for_destroy(){
       hideModal();
+      $("#curr_page").val($("#curr_page_span").html());
       $(".re_search").submit();
   }
 </script>

app/views/files/_course_file.html.erb

@@ -98,6 +98,8 @@
     <div class="reTop mb5">
       <%= form_tag( search_course_files_path(@course), method: 'get',:class => "re_search",:remote=>true) do %>
           <%= text_field_tag 'name', params[:name], name: "name", :class => 'researchBox fl',:style=>"padding: 0px"%>
+          <input type="hidden" name="page" id="curr_page">
+          <span class="none" id="curr_page_span"><%= @curr_page %></span>
           <%= submit_tag "班内搜索", :class => "blueBtn mr5 fl",:name => "incourse",:id => "incourse" %>
           <%#= submit_tag "全站搜索", :class => "blueBtn mr5 fl",:name => "insite",:id => "insite" %>
           <% if is_course_teacher(User.current,@course) || (@course.publish_resource==1 && User.current.member_of_course?(@course) ) %>