From a7a2be6a4bec789dc0e50ee6076dcac281fdaa28 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Tue, 24 May 2016 16:01:02 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           | 73 ++++++++++++-------
 app/views/users/_show_user_resource.html.erb  | 15 ++--
 .../users/_user_homework_attachment.html.erb  |  2 +-
 app/views/users/user_import_resource.js.erb   |  2 +-
 .../users/user_ref_resource_search.js.erb     | 13 +++-
 5 files changed, 68 insertions(+), 37 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 853219426..6f3cca744 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1022,20 +1022,34 @@ class UsersController < ApplicationController
 
   #用户从资源库导入资源到作业
   def user_import_resource
-    @user = User.current
-    user_course_ids = @user.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
-    @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','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(',')}))").order("created_on desc")
+    if User.current.id.to_i != params[:id].to_i
+      render_403
+      return
+    end
+    @resource_id = params[:project_id].nil? ? (params[:course_id].nil? ? params[:subfield_file_id] : params[:course_id]) : params[:project_id]
+    @resource_type = params[:project_id].nil? ? (params[:course_id].nil? ? "SubfieldFile" : "Course") : "Project"
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
+    user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
+    user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }   # user_org_ids = User.current.organizations.map {|o| o.id}
+    if(params[:type] == "1") # 我的资源
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
+      @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
+    elsif (params[:type].blank? ||params[:type] == "6") # 公共资源
+      # 公共资源库：所有公开资源或者我上传的私有资源
+      @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
+    end
+    @status = params[:status]
     @type = params[:type]
     @homework_id = params[:homework_id]
-    @limit = 7
+    @limit = 10
     @is_remote = true
+    @seleted_resources = session[:seleted_resource_ids].nil? ? [] : session[:seleted_resource_ids]
     @atta_count = @attachments.count
     @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
     @offset ||= @atta_pages.offset
-    @seleted_resources = session[:seleted_resource_ids].nil? ? [] : session[:seleted_resource_ids]
     #@curse_attachments_all = @all_attachments[@offset, @limit]
-    @attachments = paginateHelper @attachments,7
+    @attachments = paginateHelper @attachments,10
     respond_to do |format|
       format.js
     end
@@ -1043,10 +1057,10 @@ class UsersController < ApplicationController
 
   #引入资源列表根据类型过滤
   def user_resource_type
-    if User.current.id.to_i != params[:id].to_i
-      render_403
-      return
-    end
+    # if User.current.id.to_i != params[:id].to_i
+    #   render_403
+    #   return
+    # end
     user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
     user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
     # user_org_ids = User.current.organizations.map {|o| o.id}
@@ -1095,22 +1109,27 @@ class UsersController < ApplicationController
 
   #引入资源列表根据关键词过滤
   def user_ref_resource_search
-    search = params[:search].to_s.strip.downcase
-    if(params[:type].blank? || params[:type] == "1") #全部
-      user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id} #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源 取交集并查询
-      @attachments = Attachment.where("((author_id = #{params[:id]} and container_type in('Project','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 (filename like '%#{search}%') ").order("created_on desc")
-    elsif params[:type] == "2" #课程资源
+    if User.current.id.to_i != params[:id].to_i
+      render_403
+      return
+    end
+    @resource_id = params[:mul_id]
+    @resource_type = params[:mul_type]
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
+    @user = User.current
+    @switch_search = params[:search].nil? ? " " : params[:search]
+    search = "%#{@switch_search.strip.downcase}%"
+    # 别人的资源库是没有权限去看的
+    if(params[:type] == "1") # 我的资源
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
       user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && 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 '%#{search}%') ").order("created_on desc")
-    elsif params[:type] == "3" #项目资源
-      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'  and (filename like '%#{search}%')").order("created_on desc")
-    elsif params[:type] == "4" #附件
-      @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like '%#{search}%')").order("created_on desc")
-    elsif params[:type] == "5" #用户资源
-      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal' and (filename like '%#{search}%')").order("created_on desc")
-    elsif params[:type] == "6" #公共资源
-      @attachments = Attachment.where("(is_public =1 and is_publish = 1 and container_id is not null)" + "or (author_id = #{params[:id]} and is_publish = 0)").order("created_on desc")
+      user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
+      # user_org_ids = User.current.organizations.map {|o| o.id}
+      @attachments = get_my_resources_search(params[:id], user_course_ids, user_project_ids, @order, @score, search)
+    elsif (params[:type].blank? || params[:type] == "6") # 公共资源
+      # 公共资源库：所有公开资源或者我上传的私有资源
+      @attachments = get_public_resources_search(user_course_ids, user_project_ids, @order, @score, search)
     end
     @type = params[:type]
     @limit = 7
@@ -1120,7 +1139,7 @@ class UsersController < ApplicationController
     @offset ||= @atta_pages.offset
     @seleted_resources = session[:seleted_resource_ids].nil? ? [] : session[:seleted_resource_ids]
     #@curse_attachments_all = @all_attachments[@offset, @limit]
-    @attachments = paginateHelper @attachments,7
+    @attachments = paginateHelper @attachments, 7
     respond_to do |format|
       format.js
     end
diff --git a/app/views/users/_show_user_resource.html.erb b/app/views/users/_show_user_resource.html.erb
index 6c3216f11..f2c28387f 100644
--- a/app/views/users/_show_user_resource.html.erb
+++ b/app/views/users/_show_user_resource.html.erb
@@ -10,11 +10,16 @@
 //    });
 
     $(document).ready(function(){
+        <% if type == "1" %>
+        $("#my_resources_choose_homework").addClass("referenceTypeActive");
+        $("#public_resources_choose_homework").removeClass("referenceTypeActive");
+        <% else %>
         $(".referenceTypeBlock").click(function(){
             var activeBlock = $(".referenceResourceType").children(".referenceTypeActive");
             activeBlock.removeClass("referenceTypeActive");
             $(this).addClass("referenceTypeActive");
         });
+        <% end %>
     });
 
 // 点击 checkbox选中引用的资源的时候，保存该资源的id到session里去
@@ -36,14 +41,12 @@ function store_seleted_resource(dom){
   </div>
   <div>
     <div class="referenceResourceType fl">
-      <a href="<%= user_resource_type_user_path(user)%>" class="referenceTypeBlock referenceTypeActive" data-remote="true" >资源库</a>
-      <a href="<%= user_resource_type_user_path(user,:type=>'2')%>" class="referenceTypeBlock"  data-remote="true">课程资源</a>
-      <a href="<%= user_resource_type_user_path(user,:type=>'3')%>" class="referenceTypeBlock"  data-remote="true">项目资源</a>
-      <a href="<%= user_resource_type_user_path(user,:type=>'5')%>" class="referenceTypeBlock"  data-remote="true">用户资源</a>
-      <a href="<%= user_resource_type_user_path(user,:type=>'4')%>" class="referenceTypeBlock"  data-remote="true">附件</a> </div>
+      <a href="<%= user_ref_resource_search_user_path(User.current, :type => '6') %>" id="public_resources_choose_homework" class="referenceTypeBlock referenceTypeActive" data-remote="true">公共资源</a>
+      <a href="<%= user_ref_resource_search_user_path(User.current, :type => '1') %>"  id="my_resources_choose_homework"  class="referenceTypeBlock" data-remote="true">我的资源</a>
+    </div>
     <div class="fr">
       <!--<form class="referenceSearchBox">-->
-      <%=  form_tag(user_ref_resource_search_user_path(user),:method => 'get',:remote=>'true',:class=>'referenceSearchBox') do%>
+      <%=  form_tag(user_ref_resource_search_user_path(user, :type => @type),:method => 'get',:remote=>'true',:class=>'referenceSearchBox') do%>
         <input type="text" name="search" placeholder="输入资源关键词进行搜索" class="searchReferencePopup" />
         <a href="javascript:void(0);" onclick="$(this).parent().submit();" class="referenceSearchIcon"></a>
       <% end %>
diff --git a/app/views/users/_user_homework_attachment.html.erb b/app/views/users/_user_homework_attachment.html.erb
index 673cee0e1..9f9aea60f 100644
--- a/app/views/users/_user_homework_attachment.html.erb
+++ b/app/views/users/_user_homework_attachment.html.erb
@@ -70,7 +70,7 @@
 <div class="mt5 fl">
    <!-- , user_import_resource_user_path(User.current.id,:homework_id=>container.id) -->
   <a href="javascript:void(0);" class="AnnexBtn fl mt3 mr15" onclick="$('#_file').click();" title="请选择文件上传">上传附件</a>
-  <%= link_to "资源库",{:controller => 'users',:action=>'user_import_resource',:id=>User.current.id,:homework_id=>container.id},:class => "FilesBtn fl mt3 mr15",:title=>"请从资源库中选择文件作为作品的附件",:remote => true%>
+  <%= link_to "资源库",{:controller => 'users', :action => 'user_ref_resource_search', :id => User.current.id, :homework_id => container.id, :type => nil}, :class => "FilesBtn fl mt3 mr15", :title => "请从资源库中选择文件作为作品的附件", :remote => true %>
   <% if defined?(has_program) && has_program %>
     <div id="program_setting" class="fl">
         <a href="javascript:void(0);" class="ProBtn fl mt3"title="请设置编程语言和输入测试集">编程</a>
diff --git a/app/views/users/user_import_resource.js.erb b/app/views/users/user_import_resource.js.erb
index 87324669e..cd302a9c1 100644
--- a/app/views/users/user_import_resource.js.erb
+++ b/app/views/users/user_import_resource.js.erb
@@ -1,4 +1,4 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_resource',:locals => {:user => @user,:homework_id=>@homework_id,:seleted_resources=>@seleted_resources}) %>');
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_resource',:locals => {:user => @user, :homework_id => @homework_id, :seleted_resources=> @seleted_resources, :type => @type}) %>');
 showModal('ajax-modal', '730px');
 $('#ajax-modal').css('height','500px').css("width","730px");
 $('#ajax-modal').siblings().remove();
diff --git a/app/views/users/user_ref_resource_search.js.erb b/app/views/users/user_ref_resource_search.js.erb
index 8651768a5..e6af1bc47 100644
--- a/app/views/users/user_ref_resource_search.js.erb
+++ b/app/views/users/user_ref_resource_search.js.erb
@@ -1,2 +1,11 @@
-$("#user_ref_resources").html('<%= escape_javascript(render :partial => 'homework_ref_resources_list',:locals=>{:attachments => @attachments,:seleted_resources=>@seleted_resources})%>');
-$("#resource_ref_pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
\ No newline at end of file
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'users/show_user_resource',:locals => {:user => @user, :homework_id => @homework_id, :seleted_resources=> @seleted_resources, :type => @type}) %>');
+showModal('ajax-modal', '730px');
+$('#ajax-modal').css('height','auto').css("width","730px");
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<div class='resourcePopupClose mt5 mr-5'>" + "<a href='javascript:void(0)' class='resourceClose' onclick='hideResource();'></a></div>");
+$('#ajax-modal').parent().css("top","30%").css("left","").css("position","fixed");
+$('#ajax-modal').parent().addClass("popbox").addClass("referenceResourcesPopup");
+
+$("#public_resources_choose_homework").attr('href','<%= user_ref_resource_search_user_path(@user, :type => '6') %>');
+$("#my_resources_choose_homework").attr('href','<%= user_ref_resource_search_user_path(@user, :type => '1') %>');
+

From 197f054c1896a3923fe828946f3157beab51c60d Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 25 May 2016 09:10:41 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E7=A7=81=E6=9C=89=E8=B5=84=E6=BA=90=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           | 233 ++++++++----------
 app/views/users/_resources_list.html.erb      |  47 +---
 .../users/_user_import_resource_list.html.erb |  16 +-
 app/views/users/_user_resource_info.html.erb  |  10 +-
 .../users/_user_resource_tip_list.html.erb    |   2 +-
 app/views/users/user_resource.html.erb        |   6 +-
 6 files changed, 124 insertions(+), 190 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1b85a4a20..203296160 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1022,34 +1022,20 @@ class UsersController < ApplicationController
 
   #用户从资源库导入资源到作业
   def user_import_resource
-    if User.current.id.to_i != params[:id].to_i
-      render_403
-      return
-    end
-    @resource_id = params[:project_id].nil? ? (params[:course_id].nil? ? params[:subfield_file_id] : params[:course_id]) : params[:project_id]
-    @resource_type = params[:project_id].nil? ? (params[:course_id].nil? ? "SubfieldFile" : "Course") : "Project"
-    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
-    @score = @b_sort == "desc" ? "asc" : "desc"
-    user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
-    user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }   # user_org_ids = User.current.organizations.map {|o| o.id}
-    if(params[:type] == "1") # 我的资源
-      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
-      @attachments = get_my_resources(params[:id], user_course_ids, user_project_ids, @order, @score)
-    elsif (params[:type].blank? ||params[:type] == "6") # 公共资源
-      # 公共资源库：所有公开资源或者我上传的私有资源
-      @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
-    end
-    @status = params[:status]
+    @user = User.current
+    user_course_ids = @user.courses.map { |c| c.id}  #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源
+    @attachments = Attachment.where("(author_id = #{params[:id]} and container_type in('Project','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(',')}))").order("created_on desc")
     @type = params[:type]
     @homework_id = params[:homework_id]
-    @limit = 10
+    @limit = 7
     @is_remote = true
-    @seleted_resources = session[:seleted_resource_ids].nil? ? [] : session[:seleted_resource_ids]
     @atta_count = @attachments.count
     @atta_pages = Paginator.new @atta_count, @limit, params['page'] || 1
     @offset ||= @atta_pages.offset
+    @seleted_resources = session[:seleted_resource_ids].nil? ? [] : session[:seleted_resource_ids]
     #@curse_attachments_all = @all_attachments[@offset, @limit]
-    @attachments = paginateHelper @attachments,10
+    @attachments = paginateHelper @attachments,7
     respond_to do |format|
       format.js
     end
@@ -1057,10 +1043,10 @@ class UsersController < ApplicationController
 
   #引入资源列表根据类型过滤
   def user_resource_type
-    # if User.current.id.to_i != params[:id].to_i
-    #   render_403
-    #   return
-    # end
+    if User.current.id.to_i != params[:id].to_i
+      render_403
+      return
+    end
     user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
     user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
     # user_org_ids = User.current.organizations.map {|o| o.id}
@@ -1109,27 +1095,22 @@ class UsersController < ApplicationController
 
   #引入资源列表根据关键词过滤
   def user_ref_resource_search
-    if User.current.id.to_i != params[:id].to_i
-      render_403
-      return
-    end
-    @resource_id = params[:mul_id]
-    @resource_type = params[:mul_type]
-    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
-    @score = @b_sort == "desc" ? "asc" : "desc"
-    @user = User.current
-    @switch_search = params[:search].nil? ? " " : params[:search]
-    search = "%#{@switch_search.strip.downcase}%"
-    # 别人的资源库是没有权限去看的
-    if(params[:type] == "1") # 我的资源
-      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
+    search = params[:search].to_s.strip.downcase
+    if(params[:type].blank? || params[:type] == "1") #全部
+      user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id} #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源 取交集并查询
+      @attachments = Attachment.where("((author_id = #{params[:id]} and container_type in('Project','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 (filename like '%#{search}%') ").order("created_on desc")
+    elsif params[:type] == "2" #课程资源
       user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id}
-      user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
-      # user_org_ids = User.current.organizations.map {|o| o.id}
-      @attachments = get_my_resources_search(params[:id], user_course_ids, user_project_ids, @order, @score, search)
-    elsif (params[:type].blank? || params[:type] == "6") # 公共资源
-      # 公共资源库：所有公开资源或者我上传的私有资源
-      @attachments = get_public_resources_search(user_course_ids, user_project_ids, @order, @score, search)
+      @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 '%#{search}%') ").order("created_on desc")
+    elsif params[:type] == "3" #项目资源
+      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'  and (filename like '%#{search}%')").order("created_on desc")
+    elsif params[:type] == "4" #附件
+      @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like '%#{search}%')").order("created_on desc")
+    elsif params[:type] == "5" #用户资源
+      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal' and (filename like '%#{search}%')").order("created_on desc")
+    elsif params[:type] == "6" #公共资源
+      @attachments = Attachment.where("(is_public =1 and is_publish = 1 and container_id is not null)" + "or (author_id = #{params[:id]} and is_publish = 0)").order("created_on desc")
     end
     @type = params[:type]
     @limit = 7
@@ -1139,7 +1120,7 @@ class UsersController < ApplicationController
     @offset ||= @atta_pages.offset
     @seleted_resources = session[:seleted_resource_ids].nil? ? [] : session[:seleted_resource_ids]
     #@curse_attachments_all = @all_attachments[@offset, @limit]
-    @attachments = paginateHelper @attachments, 7
+    @attachments = paginateHelper @attachments,7
     respond_to do |format|
       format.js
     end
@@ -2077,18 +2058,18 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
-    elsif params[:type] == "2"
-      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
-      if params[:status] == "2"
-        resource_type = "'Course'"
-      elsif params[:status] == "3"
-        resource_type = "'Project'"
-      elsif params[:status] == "5"
-        resource_type = "'Principal'"
-      else
-        resource_type = "'Project','OrgSubfield','Principal','Course'"
-      end
-      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
+      # elsif params[:type] == "2"
+      #   apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      #   if params[:status] == "2"
+      #     resource_type = "'Course'"
+      #   elsif params[:status] == "3"
+      #     resource_type = "'Project'"
+      #   elsif params[:status] == "5"
+      #     resource_type = "'Principal'"
+      #   else
+      #     resource_type = "'Project','OrgSubfield','Principal','Course'"
+      #   end
+      #   @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @type = params[:type]
     @limit = 25
@@ -2230,18 +2211,18 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
-    elsif params[:type] == "2"
-      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
-      if params[:status] == "2"
-        resource_type = "'Course'"
-      elsif params[:status] == "3"
-        resource_type = "'Project'"
-      elsif params[:status] == "5"
-        resource_type = "'Principal'"
-      else
-        resource_type = "'Project','OrgSubfield','Principal','Course'"
-      end
-      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
+      # elsif params[:type] == "2"
+      #   apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      #   if params[:status] == "2"
+      #     resource_type = "'Course'"
+      #   elsif params[:status] == "3"
+      #     resource_type = "'Project'"
+      #   elsif params[:status] == "5"
+      #     resource_type = "'Principal'"
+      #   else
+      #     resource_type = "'Project','OrgSubfield','Principal','Course'"
+      #   end
+      #   @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @status = params[:status]
     @type = params[:type]
@@ -2371,18 +2352,18 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
-    elsif params[:type] == "2"
-      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
-      if params[:status] == "2"
-        resource_type = "'Course'"
-      elsif params[:status] == "3"
-        resource_type = "'Project'"
-      elsif params[:status] == "5"
-        resource_type = "'Principal'"
-      else
-        resource_type = "'Project','OrgSubfield','Principal','Course'"
-      end
-      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
+      # elsif params[:type] == "2"
+      #   apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      #   if params[:status] == "2"
+      #     resource_type = "'Course'"
+      #   elsif params[:status] == "3"
+      #     resource_type = "'Project'"
+      #   elsif params[:status] == "5"
+      #     resource_type = "'Principal'"
+      #   else
+      #     resource_type = "'Project','OrgSubfield','Principal','Course'"
+      #   end
+      #   @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @type = params[:type]
     @limit = 25
@@ -2719,12 +2700,12 @@ class UsersController < ApplicationController
 
   # 获取公共资源
   def get_public_resources user_course_ids, user_project_ids, order, score
-    attachments = Attachment.where("(is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course')) ").order("#{order.nil? ? 'created_on' : order} #{score}")
+    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 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}")
+    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
 
   # 获取我的资源
@@ -2748,15 +2729,15 @@ class UsersController < ApplicationController
                                and is_publish = 1 and container_id is not null)" ).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
-  # 获取我的私有资源分享结果
-  def get_my_private_resources apply_ids, resource_type, order, score
-    attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type})").order("#{order.nil? ? 'created_on' : order} #{score}")
-  end
-
-  # 获取我的私有资源分享搜索结果
-  def get_my_private_resources_search apply_ids, resource_type, order, score, search
-    attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type}) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
-  end
+  # # 获取我的私有资源分享结果
+  # def get_my_private_resources apply_ids, resource_type, order, score
+  #   attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type})").order("#{order.nil? ? 'created_on' : order} #{score}")
+  # end
+  #
+  # # 获取我的私有资源分享搜索结果
+  # def get_my_private_resources_search apply_ids, resource_type, order, score, search
+  #   attachments = Attachment.where("id in (#{apply_ids.empty? ? '0': apply_ids.join(',')}) and container_type in(#{resource_type}) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
+  # end
 
   # 获取我的课程资源中搜索结果
   def get_course_resources_search author_id, user_course_ids, order, score, search
@@ -2767,12 +2748,12 @@ class UsersController < ApplicationController
 
   # 获取公共资源中课程资源
   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)").order("#{order.nil? ? 'created_on' : 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 (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
+    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
 
   # 获取我的项目资源
@@ -2791,12 +2772,12 @@ class UsersController < ApplicationController
 
   # 获取公共资源的项目资源
   def get_project_resources_public  user_project_ids, order, score
-    attchments = Attachment.where("container_type = 'Project' and container_id is not null").order("#{order.nil? ? 'created_on' : 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 (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}")
+    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
 
   # 获取我上传的附件
@@ -2814,13 +2795,13 @@ class UsersController < ApplicationController
   # 获取公共资源中我上传的附件
   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").order("#{order.nil? ? 'created_on' : order} #{score}")
+                               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 (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
+                               and container_id is not null and is_public =1) and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
   end
 
   # 获取我的用户类型资源
@@ -2835,12 +2816,12 @@ class UsersController < ApplicationController
 
   # 获取我的用户类型资源
   def get_principal_resources_public order, score
-    attchments = Attachment.where("container_type = 'Principal' and container_id is not null").order("#{order.nil? ? 'created_on' : order} #{score}")
+    attchments = Attachment.where("container_type = 'Principal' and is_public =1 and container_id is not null").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 (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}")
+    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
 
   # 资源库 分为全部  课程资源 项目资源 附件
@@ -2882,18 +2863,18 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
-    elsif params[:type] == "2" # 私有资源
-      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
-      if params[:status] == "2"
-        resource_type = "'Course'"
-      elsif params[:status] == "3"
-        resource_type = "'Project'"
-      elsif params[:status] == "5"
-        resource_type = "'Principal'"
-      else
-        resource_type = "'Project','OrgSubfield','Principal','Course'"
-      end
-      @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
+      # elsif params[:type] == "2" # 私有资源
+      #   apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      #   if params[:status] == "2"
+      #     resource_type = "'Course'"
+      #   elsif params[:status] == "3"
+      #     resource_type = "'Project'"
+      #   elsif params[:status] == "5"
+      #     resource_type = "'Principal'"
+      #   else
+      #     resource_type = "'Project','OrgSubfield','Principal','Course'"
+      #   end
+      #   @attachments = get_my_private_resources(apply_ids, resource_type, @order, @score)
     end
     @status = params[:status]
     @type = params[:type]
@@ -3073,19 +3054,19 @@ class UsersController < ApplicationController
         # 公共资源库：所有公开资源或者我上传的私有资源
         @attachments = get_public_resources_search(user_course_ids, user_project_ids, @order, @score, search)
       end
-    elsif params[:type] == "2" # 私有资源
-      apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
-      if params[:status] == "2"
-        resource_type = "'Course'"
-      elsif params[:status] == "3"
-        resource_type = "'Project'"
-      elsif params[:status] == "5"
-        resource_type = "'Principal'"
-      else
-        resource_type = "'Project','OrgSubfield','Principal','Course'"
-      end
-      @attachments = get_my_private_resources_search(apply_ids, resource_type, @order, @score, search)
-      @attachments
+      # elsif params[:type] == "2" # 私有资源
+      #   apply_ids = ApplyResource.where("user_id =? and status =?", params[:id], 2).map { |ar| ar.attachment_id}
+      #   if params[:status] == "2"
+      #     resource_type = "'Course'"
+      #   elsif params[:status] == "3"
+      #     resource_type = "'Project'"
+      #   elsif params[:status] == "5"
+      #     resource_type = "'Principal'"
+      #   else
+      #     resource_type = "'Project','OrgSubfield','Principal','Course'"
+      #   end
+      #   @attachments = get_my_private_resources_search(apply_ids, resource_type, @order, @score, search)
+      #   @attachments
     end
     @status = params[:status]
     @type = params[:type]
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 3aaed7594..26e8f922b 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -6,55 +6,20 @@
     <% attachments.each do |attach| %>
         <ul class="resource-list" onmouseover="if($('#contextMenu').css('display') != 'block')$(this).children().css('background-color', '#e1e1e1')" onmouseout=" if($('#contextMenu').css('display') == 'none')$(this).children().css('background-color', 'white')">
           <li class="resource-list-checkbox fl">
-            <% if private_attachment_allow(attach.id) && (@type == "6" || @type == "2")  %>
-                <input name="checkbox1[]" type="checkbox" disabled="disabled" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
-            <% else %>
-                <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
-            <% end %>
+            <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="resourcesCheckbox" />
             <!--<input name="checkbox2" type="checkbox" value="" class="resourcesCheckbox" />-->
           </li>
           <li class="resource-list-name fl">
-            <% if private_attachment_allow(attach.id) %>
-                <a style="cursor: default" class = "resourcesBlack resource-list-middle hidden mw280" title="<%= attach.filename %>"><%= attach.filename %> </a>
-            <% else %>
-                <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack resource-list-middle hidden mw280' %>
-            <% end %>
-            <% if private_attachment_allow(attach.id)  && (@type == "6" || @type == "2") %>
-                <img src="/images/locked.png" alt="私有" title="私有" class="resource-list-middle" height="16" width="16">
-            <% end %>
-          </li>
-          <li class="resource-list-apply fr" id="resource_apply_status_<%=attach.id %>">
-            <% if private_attachment_allow(attach.id) && (@type == "6" || @type == "2") %>
-                <% ah = attach.get_status_by_attach(User.current.id) %>
-                <% if ah.nil?  %>
-                    <%= link_to("请求分享", apply_resource_user_path(User.current.id, :attachment_id => attach.id), :class => 'green_btn_share c_white', :remote => true) %>
-                <% elsif ah == 1 %>
-                    等待回复
-                <% elsif ah == 2 %>
-                    可引用
-                <% elsif ah == 3 %>
-                    已拒绝
-                <% end %>
-            <% else %>
-                <% ah = attach.get_status_by_attach(User.current.id) %>
-                <% if ah == 2 %>
-                    可引用
-                <% else %>
-                    --
-                <% end %>
-            <% end %>
+            <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename, :class => 'resourcesBlack resource-list-middle hidden mw280' %>
           </li>
           <li class="resource-list-time fr"><%= format_date(attach.created_on) %></li>
           <li class="resource-list-quote fr"><%= attach.quotes.nil? ? 0 : attach.quotes %></li>
           <li class="resource-list-download fr"><%= attach.downloads %></li>
           <li style="display: none"><%= attach.author_id %></li>
           <li class="resource-list-size fr"><%= (number_to_human_size(attach.filesize)).gsub("ytes", "") %></li>
-          <li class="resource-list-uploader fr hidden"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
+          <li class="resource-list-uploader fr hidden"><%= User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
           <li class="resource-list-type fr"><%= get_resource_type(attach.container_type)%></li>
           <li class="resource-list-from fr hidden" title="<%= get_resource_origin(attach) %>"><%= get_resource_origin(attach) %></li>
-          <li style="display: none"><%= private_attachment_allow(attach.id) %></li>
-          <li style="display: none"><%= attach.get_apply_resource_status(attach.id, User.current.id) %></li>
-          <li style="display: none"><%= private_attachment_allow(attach.id) ? 0 : 1 %></li>
           <li style="display: none"><%= attach.id %></li>
         </ul>
         <div class="cl"></div>
@@ -104,7 +69,7 @@
         document.oncontextmenu = function() {return true;}
         line.children().css("background-color",'white');
         id = line.children().last().html();
-        user_id = line.children().eq(6).html();
+        user_id = line.children().eq(5).html();
         allow = line.children().eq(13).html();
         if( allow == 0){
             alert('您无权发送私有资源')
@@ -219,7 +184,7 @@
         }
         line.children().css("background-color", 'white');
         id = line.children().last().html();
-        user_id = line.children().eq(6).html();
+        user_id = line.children().eq(5).html();
         if(user_id === '<%= User.current.id%>') {
             if(line.children().first().children().data('hasHistory') == 'Y'){
                 alert('该资源存在历史版本，不能删除');
@@ -228,7 +193,7 @@
             if (confirm('确定要删除资源"' + line.children().eq(1).children().attr('title').trim() + '"么?')) {
                 $.ajax({
                     type: 'post',
-                    url: '<%= user_resource_delete_user_path(User.current.id)%>' + '?resource_id=' + id + '&type=<%=@type %>&status=<%=@status %>'
+                    url: '<%= user_resource_delete_user_path(User.current.id) %>' + '?resource_id=' + id + '&type=<%= @type %>&status=<%= @status %>'
                 });
             }
 
diff --git a/app/views/users/_user_import_resource_list.html.erb b/app/views/users/_user_import_resource_list.html.erb
index 26118f3f4..e886c16ca 100644
--- a/app/views/users/_user_import_resource_list.html.erb
+++ b/app/views/users/_user_import_resource_list.html.erb
@@ -6,22 +6,10 @@
         <ul class="subjectRow">
           <li class="subjectName fl hidden">
             <label>
-              <% if private_attachment_allow(attach.id) && (@type == "6" || @type == "2") %>
-                  <input name="checkbox1[]" type="checkbox" disabled="disabled" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;" />
-              <% else %>
-                  <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;"  />
-              <% end %>
-
+              <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;"  />
               <span>
-                <% if private_attachment_allow(attach.id) %>
-                    <a style="cursor: default"  title="<%= attach.filename %>"><%= attach.filename %> </a>
-                <% else %>
-                    <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename%>
-                <% end %>
+                <%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename%>
               </span>
-              <% if private_attachment_allow(attach.id)  && (@type == "6" || @type == "2") %>
-                  <img src="/images/locked.png" alt="私有" title="私有" class="resource-list-middle" height="16" width="16">
-              <% end %>
             </label>
           </li>
           <li class="subjectType fl"><%= get_resource_type(attach.container_type)%></li>
diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index 9c321cdb5..c415ba0b4 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -19,13 +19,13 @@
     <div class="resource-check-all">
       <input id="checkboxAll" type="checkbox" value="" onclick="all_select();" class="resourcesCheckbox" />
     </div>
-    <!--<a href="javascript:void(0);" class="replyGrey mr15" onclick="all_select();">全选</a> -->
+    <a href="javascript:void(0);" class="replyGrey mr15" onclick="all_select();">全选</a>
     <a href="javascript:void(0);" class="replyGrey" onclick="batch_delete();">删除</a> </div>
   <div class="cl"></div>
   <div class="resourcesSelectSend mt10 fl">
-    <!--<div class="resourcesSelectSendButton fl mr15 inactive-border"  onclick="batch_send();">-->
-    <!--&lt;!&ndash;<a href="javascript:void(0);" class="sendButtonBlue db inactive-text"  data-remote="true">发送至</a>&ndash;&gt;-->
-    <!--</div>-->
+    <div class="resourcesSelectSendButton fl mr15 inactive-border"  onclick="batch_send();">
+      <a href="javascript:void(0);" class="sendButtonBlue db inactive-text"  data-remote="true">发送至</a>
+    </div>
     <div class="fl">选择&nbsp;<span class="c_red" id="res_count">0</span>&nbsp;个资源</div>
   </div>
 
@@ -215,7 +215,7 @@
         document.oncontextmenu = function() {return true;}
         line.children().css("background-color",'white');
         id = line.children().last().html();
-        user_id = line.children().eq(6).html();
+        user_id = line.children().eq(5).html();
         if(user_id === '<%= User.current.id %>') {
             res_name = line.children().eq(1).children().attr('title');
             res_link = line.children().eq(1).html();
diff --git a/app/views/users/_user_resource_tip_list.html.erb b/app/views/users/_user_resource_tip_list.html.erb
index 67fe292ee..35ca130dd 100644
--- a/app/views/users/_user_resource_tip_list.html.erb
+++ b/app/views/users/_user_resource_tip_list.html.erb
@@ -1,7 +1,7 @@
 <ul class="resource-list-tab mt10" id="resource_tip_list">
   <li class="resource-list-checkbox fl"> </li>
   <li class="resource-list-name fl">资源名称</li>
-  <li class="resource-list-apply fr">操作</li>
+  <!--<li class="resource-list-apply fr">操作</li>-->
   <li class="resource-list-time fr">
     <%= link_to "上传时间", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "created_on", :search => " "), :class => "fl", :remote => true %>
     <% if @order == "created_on" %>
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index a8bd96859..d2e3242d8 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -55,9 +55,9 @@
     <li class="fl resource-switch">
       <a href="<%= user_resource_user_path(@user, :type => '1', :status => 6) %>"  class="resource-tab" id="my_resource_list" data-remote="true">我的资源</a>
     </li>
-    <li class="fl resource-switch">
-      <a href="<%= user_resource_user_path(@user, :type => '2', :status => 6) %>"  class="resource-tab" id="private_resource_list" data-remote="true">申请资源</a>
-    </li>
+    <!--<li class="fl resource-switch">-->
+    <!--<a href="<%#= user_resource_user_path(@user, :type => '2', :status => 6) %>"  class="resource-tab" id="private_resource_list" data-remote="true">申请资源</a>-->
+    <!--</li>-->
     <li class="fl w680 border-bottom h34">&nbsp;</li>
     <li class="fr resource-banner-li border-bottom h34">
       <div id="user_resource_type_filter">

From b6de2dbd2d7376b4c36dbf8cc9070fbd140e5dd4 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 25 May 2016 09:44:30 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=8F=91=E5=B8=83=E4=BD=9C=E4=B8=9A?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=B5=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb                | 1 +
 app/views/users/_user_homework_attachment.html.erb | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 203296160..1e12db25d 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1096,6 +1096,7 @@ class UsersController < ApplicationController
   #引入资源列表根据关键词过滤
   def user_ref_resource_search
     search = params[:search].to_s.strip.downcase
+    @user = User.current
     if(params[:type].blank? || params[:type] == "1") #全部
       user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id} #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源 取交集并查询
       @attachments = Attachment.where("((author_id = #{params[:id]} and container_type in('Project','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+
diff --git a/app/views/users/_user_homework_attachment.html.erb b/app/views/users/_user_homework_attachment.html.erb
index 9f9aea60f..669e7aa91 100644
--- a/app/views/users/_user_homework_attachment.html.erb
+++ b/app/views/users/_user_homework_attachment.html.erb
@@ -70,7 +70,7 @@
 <div class="mt5 fl">
    <!-- , user_import_resource_user_path(User.current.id,:homework_id=>container.id) -->
   <a href="javascript:void(0);" class="AnnexBtn fl mt3 mr15" onclick="$('#_file').click();" title="请选择文件上传">上传附件</a>
-  <%= link_to "资源库",{:controller => 'users', :action => 'user_ref_resource_search', :id => User.current.id, :homework_id => container.id, :type => nil}, :class => "FilesBtn fl mt3 mr15", :title => "请从资源库中选择文件作为作品的附件", :remote => true %>
+  <%= link_to "资源库", user_ref_resource_search_user_path(User.current.id, :homework_id => container.id), :class => "FilesBtn fl mt3 mr15", :title => "请从资源库中选择文件作为作品的附件", :remote => true %>
   <% if defined?(has_program) && has_program %>
     <div id="program_setting" class="fl">
         <a href="javascript:void(0);" class="ProBtn fl mt3"title="请设置编程语言和输入测试集">编程</a>

From 72ae31b7f989b21b80eae84131a7a237eecea94f Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 25 May 2016 11:23:19 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=BB=A3=E7=A0=81=E5=9B=9E=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb | 34 ++++++++++++++++-------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1e12db25d..121b93dc5 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1095,23 +1095,27 @@ class UsersController < ApplicationController
 
   #引入资源列表根据关键词过滤
   def user_ref_resource_search
-    search = params[:search].to_s.strip.downcase
+    if User.current.id.to_i != params[:id].to_i
+      render_403
+      return
+    end
+    @resource_id = params[:mul_id]
+    @resource_type = params[:mul_type]
+    @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc"
+    @score = @b_sort == "desc" ? "asc" : "desc"
     @user = User.current
-    if(params[:type].blank? || params[:type] == "1") #全部
-      user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id} #我的资源库的话，那么应该是我上传的所有资源 加上 我加入的课程的所有资源 取交集并查询
-      @attachments = Attachment.where("((author_id = #{params[:id]} and container_type in('Project','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 (filename like '%#{search}%') ").order("created_on desc")
-    elsif params[:type] == "2" #课程资源
+    @switch_search = params[:search].nil? ? " " : params[:search]
+    search = "%#{@switch_search.strip.downcase}%"
+    # 别人的资源库是没有权限去看的
+    if(params[:type] == "1") # 我的资源
+      # 修正：我的资源库的话，那么应该是我上传的所有资源加上，我加入的课程、项目、组织的所有资源
       user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && 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 '%#{search}%') ").order("created_on desc")
-    elsif params[:type] == "3" #项目资源
-      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Project'  and (filename like '%#{search}%')").order("created_on desc")
-    elsif params[:type] == "4" #附件
-      @attachments = Attachment.where("author_id = #{params[:id]} and container_type in('Project','Issue','Document','Message','News','StudentWorkScore','HomewCommon')  and (filename like '%#{search}%')").order("created_on desc")
-    elsif params[:type] == "5" #用户资源
-      @attachments = Attachment.where("author_id = #{params[:id]} and container_type = 'Principal' and (filename like '%#{search}%')").order("created_on desc")
-    elsif params[:type] == "6" #公共资源
-      @attachments = Attachment.where("(is_public =1 and is_publish = 1 and container_id is not null)" + "or (author_id = #{params[:id]} and is_publish = 0)").order("created_on desc")
+      user_project_ids = User.current.projects.map {|p| p.status != 9 && p.id }
+      # user_org_ids = User.current.organizations.map {|o| o.id}
+      @attachments = get_my_resources_search(params[:id], user_course_ids, user_project_ids, @order, @score, search)
+    elsif (params[:type].blank? || params[:type] == "6") # 公共资源
+      # 公共资源库：所有公开资源或者我上传的私有资源
+      @attachments = get_public_resources_search(user_course_ids, user_project_ids, @order, @score, search)
     end
     @type = params[:type]
     @limit = 7