diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index aa2c9574b..0003f7586 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -67,9 +67,7 @@ class FilesController < ApplicationController
       end
       sort = "#{@sort} #{@order}"
     end
-
     # show_attachments [@course]
-
     begin
       q = "%#{params[:name].strip}%"
       #(redirect_to stores_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
@@ -108,14 +106,18 @@ class FilesController < ApplicationController
       end
       sort = "#{@sort} #{@order}"
     end
-
     begin
       q = "%#{params[:name].strip}%"
       #(redirect_to stores_url, :notice => l(:label_sumbit_empty);return) if params[:name].blank?
       if params[:insite]
-        @result = find_public_attache q,sort
-        @result = visable_attachemnts_insite @result,@project
-        @searched_attach = paginateHelper @result,10
+        if q == "%%"
+          @result = []
+          @searched_attach = paginateHelper @result,10
+        else
+          @result = find_public_attache q,sort
+          @result = visable_attachemnts_insite @result,@project
+          @searched_attach = paginateHelper @result,10
+        end
       else
         @result = find_project_attache q,@project,sort
         @result = visable_attachemnts @result
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 0836bf307..a07ff320d 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -622,8 +622,8 @@ module ApplicationHelper
   # 公开项目资源可以引用，admin和管理员和资源上传者拥有设置公开私有权限
   def authority_pubilic_for_files(project, file)
     @result = false
-    if (is_project_manager?(User.current.id, @project.id) || file.author_id == User.current.id || User.current.admin) &&
-        project_contains_attachment?(project,file) && file.container_id == project.id && file.container_type == "Project"
+    if (is_project_manager?(User.current.id, @project.id) &&  User.current.allowed_to?(:manage_files, project)) || file.author_id == User.current.id || User.current.admin &&
+      project_contains_attachment?(project,file) && file.container_id == project.id && file.container_type == "Project"
       @result = true
     end
     return @result
diff --git a/app/views/files/_project_file_list.html.erb b/app/views/files/_project_file_list.html.erb
index d32d2319f..35aa36195 100644
--- a/app/views/files/_project_file_list.html.erb
+++ b/app/views/files/_project_file_list.html.erb
@@ -1,4 +1,4 @@
-
+<% delete_allowed = User.current.allowed_to?(:manage_files, project) %>
 <div class="re_con_top">
   <p class="f_l  c_blue f_b f_14">共有&nbsp;<%= all_attachments.count%>&nbsp;个资源</p>
   <p class="f_r" style="color: #808080">
@@ -22,13 +22,13 @@
           <% if User.current.logged? %>
               <% if (manage_allowed || file.author_id == User.current.id) && project_contains_attachment?(project,file) %>
                   <%= link_to(l(:label_slected_to_other_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
-              <% else %>
-                  <%= link_to(l(:label_slected_to_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
-              <% end %>
-              <% if authority_pubilic_for_files(project, file) %>
+                  <% if authority_pubilic_for_files(project, file) && delete_allowed %>
                     <span id="is_public_<%= file.id %>">
                       <%= link_to (file.is_public? ? "公开":"私有"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"f_l re_open",:method => :post  %>
                     </span>
+                  <% end %>
+              <% else %>
+                  <%= link_to(l(:label_slected_to_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
               <% end %>
           <% end %>
         </div>