diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb
index 075a54f65..a2dd8c869 100644
--- a/app/controllers/files_controller.rb
+++ b/app/controllers/files_controller.rb
@@ -74,6 +74,7 @@ class FilesController < ApplicationController
     @containers += @project.versions.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").all.sort
    
     @attachtype = params[:type].to_i
+    @contenttype = params[:contentType].to_s
 
     respond_to do |format|
       format.js
diff --git a/app/helpers/files_helper.rb b/app/helpers/files_helper.rb
index ffa1348fd..16a3d8b58 100644
--- a/app/helpers/files_helper.rb
+++ b/app/helpers/files_helper.rb
@@ -44,9 +44,22 @@ module FilesHelper
     File.new(zipfile_name,'w+')
   end
 
-  def browseByCategory
-    isCategoryBrowser = 1
-    #isCategoryBrowser
+  # 判断指定的资源时候符合类型
+  def isTypeOk(attachment, type, contentType)
+    result = false
+    if type != 0
+      if attachment.attachtype == type
+        result = true
+      end
+    else
+      result = true
+    end
+    if  result
+      if    contentType != l(:attachment_all) && contentType != attachment.suffix_type
+        result = false
+         end
+    end
+    result
   end
 
 
diff --git a/app/views/files/_new.html.erb b/app/views/files/_new.html.erb
index fcb916e3b..4c1b97fa1 100644
--- a/app/views/files/_new.html.erb
+++ b/app/views/files/_new.html.erb
@@ -13,7 +13,7 @@
 
   <% if attachmenttypes.any? %>
       <p>      <label for="attachment_type"><%=l(:attachment_type)%></label>
-        <%= select_tag "attachment_type", content_tag('option', '') +
+        <%= select_tag "attachment_type",
                 options_from_collection_for_select(attachmenttypes, "id",
                                                    "typeName") %>
       </p>
diff --git a/app/views/files/_sort_by_attachtypel.html.erb b/app/views/files/_sort_by_attachtypel.html.erb
index 82d2a7b87..5d5f28653 100644
--- a/app/views/files/_sort_by_attachtypel.html.erb
+++ b/app/views/files/_sort_by_attachtypel.html.erb
@@ -1,4 +1,5 @@
 <% selAttachType =@attachtype %>
+<% selContentType =@contenttype %>
 <% delete_allowed = User.current.allowed_to?(:manage_files, @project) %>
 <% edit_allowed = User.current.allowed_to?(:manage_files, @project) %>
 <div id="catarory_browse_div" class="catarory_browse_div">
@@ -27,7 +28,7 @@
       <% @containers.each do |container| %>
           <% next if container.attachments.empty? -%>
           <% container.attachments.each do |file| %>
-              <% if file.attachtype==selAttachType %>
+              <% if isTypeOk(file,selAttachType,selContentType) %>
                   <tr class="file <%= cycle("odd", "odd") %>">
                     <td class="filename" style="font-size: 13px; width: 240px; "><%= link_to_attachment file, :download => true, :title => file.filename+"\n"+file.description.to_s, :style => "width: 230px; overflow: hidden; white-space: nowrap;text-overflow: ellipsis;" %></td>
                     <td class="created_on"><%= format_time(file.created_on) %></td>
diff --git a/app/views/files/getattachtype.js.erb b/app/views/files/getattachtype.js.erb
index 4f13cc883..fe8458e20 100644
--- a/app/views/files/getattachtype.js.erb
+++ b/app/views/files/getattachtype.js.erb
@@ -1,4 +1,4 @@
-     <% if @attachtype==0%>
+     <% if @attachtype==0 && @contenttype==l(:attachment_all)%>
      $("#all_browse_div").html('<%= j(render partial: "show_all_attachment")%>');
      <%else%>
      $("#all_browse_div").html('<%= j(render partial: "sort_by_attachtypel")%>');
diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index 5abacf294..7c8129c59 100644
--- a/app/views/files/index.html.erb
+++ b/app/views/files/index.html.erb
@@ -184,13 +184,15 @@
     <%= link_to(l(:label_relation_files), 'javascript:void(0);', :onclick => "$('#upload_file_div').slideUp();$('#relation_file_div').slideToggle();", :class => 'icon m5p5 button_submit') if User.current.allowed_to?(:manage_files, @project) %>
 
     <% if attachmenttypes.any? %>
-          <label for="attachment_browse"><%=l(:attachment_browse)%></label>
-          <%= select_tag "attachment_browse", content_tag('option', '') +options_from_collection_for_select(attachmenttypes, "id", "typeName"),
+        &nbsp; &nbsp; &nbsp;
+          <label for="attachment_browse_label"><%=l(:attachment_browse)%></label>
+          <%= select_tag "attachment_browse", content_tag('option',l(:attachment_all)) +options_from_collection_for_select(attachmenttypes, "id", "typeName"),
                          :onchange=>"attachmenttypes_searchex(this.value)"%>
      <% end %>
      <% if sufixtypes.any? %>
-        <label for=""><%=l(:attachment_sufix_browse)%></label>
-        <%= select_tag "attach_sufix_browse", content_tag('option', '') +options_for_select(sufixtypes),
+        &nbsp;
+        <label for="attach_sufix_browse_label"><%=l(:attachment_sufix_browse)%></label>
+        <%= select_tag "attach_sufix_browse", content_tag('option', l(:attachment_all)) +options_for_select(sufixtypes),
                        :onchange=>"attachment_contenttypes_searchex(this.value)"%>
     <% end %>
 
@@ -286,7 +288,8 @@
 <script type="text/javascript">
     function attachmenttypes_searchex(value) {
         $.ajax({
-            url: '<%=getattachtype_project_files_path(project_id: @project)%>' + '?type=' + encodeURIComponent(value),
+            url: '<%=getattachtype_project_files_path(project_id: @project)%>' + '?type='
+                    + encodeURIComponent(value) + "&contentType=" + $('#attach_sufix_browse').val(),
             type: "POST"
 
         }).complete(function (xhr, textStatus) {
@@ -295,13 +298,14 @@
                     } else if (textStatus == 'error') {
                         alert('error');
                     }
-                    ;
                 });
     }
 
     function attachment_contenttypes_searchex(value) {
         $.ajax({
-            url: '<%=getattachtype_project_files_path(project_id: @project)%>' + '?type=' + encodeURIComponent(value),
+
+            url: '<%=getattachtype_project_files_path(project_id: @project)%>' + '?type='
+                    + $('#attachment_browse').val() + "&contentType=" + encodeURIComponent(value),
             type: "POST"
 
         }).complete(function (xhr, textStatus) {
diff --git a/config/locales/en.yml b/config/locales/en.yml
index daca03d9a..4f995d794 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -132,6 +132,7 @@ en:
 
   actionview_instancetag_blank_option: Please select
 
+  attachment_all: "All"
   attachment_browse: "Attachment Content Browse"
   attachment_sufix_browse: "Attachment Type Browse"
   attachment_type: "Attachment Type"
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index ed024d35e..6b4a925c8 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -140,6 +140,7 @@ zh:
 
   actionview_instancetag_blank_option: 请选择
 
+  attachment_all: "全部"
   attachment_sufix_browse: "文件类型"
   attachment_browse: "内容类型"
   attachment_type: '资源分类'