资源库添加搜索过滤

app/controllers/users_controller.rb

@@ -2339,6 +2339,11 @@ class UsersController < ApplicationController
     attachments = Attachment.where("(is_publish = 1 and is_public =1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course')) ").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
+  # 获取公共资源搜索
+  def get_public_resources_search user_course_ids, user_project_ids, order, score, search
+    attachments = Attachment.where("is_publish = 1 and is_public = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course') and  (filename like :p)" ,:p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
   # 获取我的资源
   def get_my_resources author_id, user_course_ids, user_project_ids, order, score
     attachments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
@@ -2348,7 +2353,7 @@ class UsersController < ApplicationController
 
   # 获取我的资源查询结果
   def get_my_resources_search (author_id, user_course_ids, user_project_ids, order, score, search)
-    @attachments = Attachment.where("((author_id = #{params[:id]} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
+    @attachments = Attachment.where("((author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
                                         "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" +
                                         "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)) and (filename like :p)" ,:p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
@@ -2360,11 +2365,23 @@ class UsersController < ApplicationController
                                and is_publish = 1 and container_id is not null)" ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
-  # 获取公共资源课程
+  # 获取我的课程资源中搜索结果
+  def get_course_resources_search author_id, user_course_ids, order, score, search
+    attchments = Attachment.where("((author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Course')"+
+                                      "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})
+                               and is_publish = 1 and container_id is not null)) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
+  # 获取公共资源中课程资源
   def get_course_resources_public user_course_ids, order, score
     attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1 and is_public =1)").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
+  # 获取公共资源中课程资源搜索结果
+  def get_course_resources_public_search user_course_ids, order, score, search
+    attchments = Attachment.where("(container_type = 'Course'and container_id is not null and is_publish = 1 and is_public =1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
   # 获取我的项目资源
   def get_project_resources author_id, user_project_ids, order, score
     attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Project') "+
@@ -2372,25 +2389,55 @@ class UsersController < ApplicationController
                               and is_publish = 1 and container_id is not null)").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
+  # 获取我的项目资源搜索
+  def get_project_resources_search author_id, user_project_ids, order, score, search
+    attchments = Attachment.where("((author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Project') "+
+                                      "or (container_type = 'Project'  and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')})
+                              and is_publish = 1 and container_id is not null)) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
   # 获取公共资源的项目资源
   def get_project_resources_public  user_project_ids, order, score
     attchments = Attachment.where("container_type = 'Project' and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
+  # 获取公共资源的项目资源搜索
+  def get_project_resources_public_search  user_project_ids, order, score, search
+    attchments = Attachment.where("(container_type = 'Project' and container_id is not null and is_public =1) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
   # 获取我上传的附件
   def get_attch_resources author_id, order, score
     attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue',
                                'Document','Message','News','StudentWorkScore','HomewCommon'))").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
+  # 获取我上传的附件搜索结果
+  def get_attch_resources_search author_id, order, score, search
+    attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue',
+                               'Document','Message','News','StudentWorkScore','HomewCommon')) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
   # 获取公共资源中我上传的附件
   def get_attch_resources_public order, score
-    attchments = Attachment.where("container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal') and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')
+                               and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
+  # 获取公共资源中我上传的附件
+  def get_attch_resources_public_search order, score, search
+    attchments = Attachment.where("(container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon','OrgSubfield','Principal')
+                               and container_id is not null and is_public =1) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的用户类型资源
   def get_principal_resources author_id, order, score
-    attchments = Attachment.where("author_id = #{params[:id]} and is_publish = 1 and container_id is not null and container_type = 'Principal'").order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Principal'").order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
+  # 获取我的用户类型资源搜索
+  def get_principal_resources_search author_id, order, score, search
+    attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Principal') and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的用户类型资源
@@ -2398,6 +2445,11 @@ class UsersController < ApplicationController
     attchments = Attachment.where("container_type = 'Principal'and container_id is not null and is_public =1").order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
+  # 获取我的用户类型资源
+  def get_principal_resources_public_search order, score, search
+    attchments = Attachment.where("(container_type = 'Principal'and container_id is not null and is_public =1) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
+  end
+
   # 资源库 分为全部  课程资源 项目资源 附件
   def user_resource
     @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
@@ -2424,14 +2476,6 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
       end
-    elsif params[:type] == "2" # 课程资源
-      @attachments = get_course_resources(params[:id], user_course_ids, params[:order], @score)
-    elsif params[:type] == "3" # 项目资源
-      @attachments = get_project_resources(params[:id], user_project_ids, params[:order], @score)
-    elsif params[:type] == "4" #附件
-      @attachments = get_attch_resources(params[:id], params[:order], @score)
-    elsif params[:type] == "5" #用户资源
-      @attachments = get_principal_resources(params[:id], params[:order], @score)
     elsif params[:type] == "6" # 公共资源
       if params[:status] == "2"
         @attachments = get_course_resources_public( user_course_ids, params[:order], @score)
@@ -2585,69 +2629,39 @@ class UsersController < ApplicationController
     @order, @b_sort = params[:order] || "created_on", params[:sort] || "desc"
     @score = @b_sort == "desc" ? "asc" : "desc"
     @user = User.current
-    switch_search = params[:search].nil? ? " " : params[:search]
-    search = "%#{switch_search.strip.downcase}%"
+    @switch_search = params[:search].nil? ? " " : params[:search]
+    search = "%#{@switch_search.strip.downcase}%"
     user_course_ids = User.current.courses.map {|c| c.id}
     user_project_ids = User.current.projects.map {|p| p.id}
-    # user_org_ids = User.current.organizations.map {|o| o.id}
     if(params[:type].nil? || params[:type].blank?  || params[:type] == "1" || params[:type] == 'all') # 全部
       if params[:status] == "2"
-        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) and (filename like :p) ",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
+        @attachments = get_course_resources_search(params[:id], user_course_ids, @order, @score, search)
       elsif params[:status] == "3"
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'  and (filename like :p)",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
+        @attachments = get_project_resources_search(params[:id], user_project_ids, @order, @score, search)
       elsif params[:status] == "4"
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like :p)",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
+        @attachments = get_attch_resources_search(params[:id], @order, @score, search)
       elsif params[:status] == "5"
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal' and (filename like :p)",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
+        @attachments = get_principal_resources_search(params[:id], @order, @score, search)
       else
         # 公共资源库：所有公开资源或者我上传的私有资源
-        get_my_resources_search(@user.id, user_course_ids, user_project_ids, @order, @score, search)
-      end
-    elsif params[:type] == "2" #课程资源
-      if User.current.id.to_i == params[:id].to_i
-        user_course_ids = User.current.courses.map { |c| c.id}
-        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) and (filename like :p) ",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
-      else
-        user_course_ids = User.find(params[:id]).courses.visible.map { |c| c.id}  #如果课程私有资源，那么要看这个资源的课程是不是在 这个user的所有我可见的课程中
-        @attachments = Attachment.where("((author_id = #{params[:id]} and is_public = 1 and container_type = 'Course') "+
-                                            "or (container_type = 'Course' and is_public = 1 and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) )"+
-                                            " and (filename like :p) ",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
+        @attachments = get_my_resources_search(params[:id], user_course_ids, user_project_ids, @order, @score, search)
       end
-    elsif params[:type] == "3" # 项目资源
-      if User.current.id.to_i == params[:id].to_i
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'  and (filename like :p)",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
-      else
-        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type = 'Project'  and (filename like :p) ",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
-      end
-    elsif params[:type] == "4" # 附件
-      if User.current.id.to_i == params[:id].to_i
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like :p)",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
-      else
-        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like :p)",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
-      end
-    elsif params[:type] == "5" # 用户资源
-      if User.current.id.to_i == params[:id].to_i
-        @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal' and (filename like :p)",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
-      else
-        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type  = 'Principal'  and (filename like :p)",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
-      end
-    elsif  params[:type] == "6" # 全部资源
+    elsif  params[:type] == "6" # 公共资源
       if params[:status] == "2"
-        @attachments = Attachment.where("(author_id = #{params[:id]} and container_type = 'Course') or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')})) and (filename like :p) ",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
+        @attachments = get_course_resources_public_search(user_course_ids, @order, @score, search)
       elsif params[:status] == "3"
-        @attachments = Attachment.where("container_type = 'Project'  and (filename like :p)",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
+        @attachments = get_project_resources_public_search(user_project_ids, @order, @score, search)
       elsif params[:status] == "4"
-        @attachments = Attachment.where("container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like :p)",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
+        @attachments = get_attch_resources_public_search(@order, @score, search)
       elsif params[:status] == "5"
-        @attachments = Attachment.where("container_type = 'Principal' and (filename like :p)",:p=>search).order("#{params[:order].nil? ? 'created_on' : params[:order]} #{@score}")
+        @attachments = get_principal_resources_public_search(@order, @score, search)
       else
         # 公共资源库：所有公开资源或者我上传的私有资源
-      @attachments = Attachment.where("is_publish = 1 and is_public = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course') and  (filename like :p)" ,:p => search).order("created_on desc")
+      @attachments = get_public_resources_search(user_course_ids, user_project_ids, @order, @score, search)
       end
     end
     @status = params[:status]
     @type = params[:type]
-    @type = params[:type]
     @limit = 25
     @is_remote = true
     @atta_count = @attachments.count

app/views/users/_user_resource_type_filter.html.erb

@@ -2,24 +2,24 @@
   <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
     <ul class="resourcesType">
       <li>
-        <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 1)%>" id="resource_type_all" class="resourcesTypeAll resourcesGrey" data-method="get" data-remote="true">全部 </a>
+        <a href="<%= resource_search_user_path(:id => @user.id, :type => @type, :status => 1, :search => @switch_search) %>" id="resource_type_all" class="resourcesTypeAll resourcesGrey" data-method="get" data-remote="true">全部 </a>
       </li>
       <li>
-        <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 2) %>" id="resource_type_course" class="homepagePostTypeAssignment postTypeGrey'" data-method="get" data-remote="true">课程资源 </a>
+        <a href="<%= resource_search_user_path(:id => @user.id, :type => @type, :status => 2, :search => @switch_search) %>" id="resource_type_course" class="homepagePostTypeAssignment postTypeGrey'" data-method="get" data-remote="true">课程资源 </a>
         <%#= link_to '课程资源' ,user_resource_user_path(:id => @user.id, :type => 2), id="resource_type_course", :remote => true, :method => 'get', :class=> 'homepagePostTypeAssignment postTypeGrey' %>
       </li>
       <li>
-        <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 3) %>" id="resource_type_project" class="homepagePostTypeQuiz postTypeGrey" data-method="get" data-remote="true">项目资源 </a>
+        <a href="<%= resource_search_user_path(:id => @user.id, :type => @type, :status => 3, :search => @switch_search) %>" id="resource_type_project" class="homepagePostTypeQuiz postTypeGrey" data-method="get" data-remote="true">项目资源 </a>
         <%#= link_to '项目资源' ,user_resource_user_path(:id => @user.id, :type => 3), id="resource_type_project", :remote => true, :method => 'get', :class => 'homepagePostTypeQuiz postTypeGrey' %>
       </li>
       <li>
-        <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 5) %>" id="resource_type_user" class="resourcesTypeUser resourcesGrey" data-method="get" data-remote="true">用户资源 </a>
+        <a href="<%= resource_search_user_path(:id => @user.id, :type => @type, :status => 5, :search => @switch_search) %>" id="resource_type_user" class="resourcesTypeUser resourcesGrey" data-method="get" data-remote="true">用户资源 </a>
         <%#= link_to '用户资源' ,user_resource_user_path(:id=>@user.id,:type=>5), id="resource_type_user", :remote=>true,:method => 'get', :class=>'resourcesTypeUser resourcesGrey' %>
       </li>
       <div id="my_files_resource">
         <% if @type != "6" %>
             <li>
-              <a href="<%= user_resource_user_path(:id => @user.id, :type => @type, :status => 4) %>" id="resource_type_file" class="resourcesTypeAtt resourcesGrey" data-method="get" data-remote="true">附件 </a>
+              <a href="<%= resource_search_user_path(:id => @user.id, :type => @type, :status => 4, :search => @switch_search) %>" id="resource_type_file" class="resourcesTypeAtt resourcesGrey" data-method="get" data-remote="true">附件 </a>
               <%#= link_to '附件' ,user_resource_user_path(:id=>@user.id,:type=>4), id="resource_type_file", :remote=>true,:method => 'get',:class=>'resourcesTypeAtt resourcesGrey' %>
             </li>
         <% end %>

app/views/users/resource_search.js.erb

@@ -5,10 +5,10 @@ $("#res_all_count").html(<%= @atta_count%>);
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);
 //更新状态
-$("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6', :status => @status) %>');
-$("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1', :status => @status) %>');
-$("#resource_type_all").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 1) %>');
-$("#resource_type_course").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 2) %>');
-$("#resource_type_project").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 3) %>');
-$("#resource_type_user").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 5) %>');
-$("#resource_type_file").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 4) %>');
+$("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6') %>');
+$("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1') %>');
+$("#resource_type_all").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 1, :search => @switch_search) %>');
+$("#resource_type_course").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 2, :search => @switch_search) %>');
+$("#resource_type_project").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 3, :search => @switch_search) %>');
+$("#resource_type_user").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 5, :search => @switch_search) %>');
+$("#resource_type_file").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 4, :search => @switch_search) %>');

app/views/users/user_resource.html.erb

@@ -2,11 +2,7 @@
 <%= stylesheet_link_tag 'project' %>
 <%= stylesheet_link_tag 'leftside' %>
 <%= javascript_include_tag 'attachments' %>
-<!--<script type="text/css">-->
-<!--html,body{ overflow-y:scroll;}-->
-<!--html,body{ overflow:scroll; min-height:101%;}-->
-<!--html{ overflow:-moz-scrollbars-vertical;}-->
-<!--</script>-->
+
 <script>
     function remote_get_resources(user_id,type){