用户资源过滤

app/controllers/users_controller.rb

@@ -1004,6 +1004,12 @@ class UsersController < ApplicationController
       else
         @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc")
       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'").order("created_on desc")
+      else
+        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type ='Principal'").order("created_on desc")
+      end
     end
     @type = params[:type] || 1
     @limit = 25
@@ -1060,6 +1066,12 @@ class UsersController < ApplicationController
       else
         @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc")
       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'").order("created_on desc")
+      else
+        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type ='Principal'").order("created_on desc")
+      end
     end
     @type = params[:type]
     @limit = 25
@@ -1464,6 +1476,12 @@ class UsersController < ApplicationController
       else
         @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type in('Issue','Document','Message','News','StudentWorkScore','HomewCommon')").order("created_on desc")
       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'").order("created_on desc")
+      else
+        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type  = 'Principal'").order("created_on desc")
+      end
     end
     @type = params[:type]
     @limit = 25
@@ -1516,6 +1534,12 @@ class UsersController < ApplicationController
       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 '%#{search}%')").order("created_on desc")
       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 '%#{search}%')").order("created_on desc")
+      else
+        @attachments = Attachment.where("author_id = #{params[:id]} and is_public = 1 and container_type  = 'Principal'  and (filename like '%#{search}%')").order("created_on desc")
+      end
     end
     @type = params[:type]
     @limit = 25

app/views/users/user_resource.html.erb

@@ -57,6 +57,9 @@
           <li>
             <%= link_to '项目资源' ,user_resource_user_path(:id=>@user.id,:type=>3),:remote=>true,:method => 'get',:class=>'homepagePostTypeQuiz postTypeGrey' %>
           </li>
+          <li>
+            <%= link_to '用户资源' ,user_resource_user_path(:id=>@user.id,:type=>5),:remote=>true,:method => 'get',:class=>'resourcesTypeAtt resourcesGrey' %>
+          </li>
           <li>
             <%= link_to '附件' ,user_resource_user_path(:id=>@user.id,:type=>4),:remote=>true,:method => 'get',:class=>'resourcesTypeAtt resourcesGrey' %>
           </li>
@@ -66,7 +69,7 @@
   </div>
   </div>
 <div class="resources mt10" id="users_setting">
-  <div class="resourcesSearchBanner">
+  <div class="resourcesSearchBanner mt10">
     <div class="resourcesUploadBox">
       <a href="javascript:void(0);" onclick="show_upload();" class="uploadBoxIcon">上传资源</a></div>
     <div id="search_div">