1.完成分类资源下载视图显示

2.优化代码，删除冗余代码

app/controllers/files_controller.rb

@@ -19,8 +19,8 @@ class FilesController < ApplicationController
   layout 'base_projects'#by young
   menu_item :files
 
-  before_filter :find_project_by_project_id
-  before_filter :authorize
+  before_filter :find_project_by_project_id#, :except => [:getattachtype]
+  before_filter :authorize, :except => [:getattachtype]
 
   helper :sort
   include SortHelper
@@ -62,20 +62,21 @@ class FilesController < ApplicationController
     redirect_to project_files_path(@project)
   end
 
-  def showbyattachtype
-    sort_init 'created_on', 'desc'
-    sort_update   'created_on' => "#{Attachment.table_name}.created_on",
+  # 返回制定资源类型的资源列表
+  def getattachtype
+    sort_init 'created_on', 'desc' 
+    sort_update   'created_on' => "#{Attachment.table_name}.created_on", 
                   'filename' => "#{Attachment.table_name}.filename",
                   'size' => "#{Attachment.table_name}.filesize",
                   'downloads' => "#{Attachment.table_name}.downloads"
-
+   
     @containers = [ Project.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@project.id)]     #modify by Long Jun
     @containers += @project.versions.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").all.sort
+   
+    @attachtype = params[:type].to_i
 
-    if @project.project_type == 1
-      render :layout => 'base_courses'
-    else
-      render :layout => !request.xhr?
+    respond_to do |format|
+      format.js
     end
   end
 end

app/controllers/school_controller.rb

@@ -23,7 +23,7 @@ class SchoolController < ApplicationController
       
     end    
   end  
-  
+
   def upload_logo
 
   end

app/views/files/_show_all_attachment.html.erb

@@ -0,0 +1,61 @@
+<% delete_allowed = User.current.allowed_to?(:manage_files, @project) %>
+  <ul id="all_browse_ul">
+    <table class="list files" id="ver-zebra" >
+      <colgroup>
+        <col class="vzebra-odd" />
+        <col class="vzebra-even" />
+        <col class="vzebra-odd" />
+        <col class="vzebra-even" />
+        <col class="vzebra-odd" />
+      </colgroup>
+      <thead><tr>
+        <%= sort_header_tag('filename', :caption => l(:field_filename), :scope =>"col" , :id => "vzebra-adventure")%>
+        <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc', :scope =>"col" , :id => "vzebra-comedy")%>
+        <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope =>"col", :id=> "vzebra-children")%>
+        <%= sort_header_tag('attach_type', :caption => l(:attachment_type), :default_order => 'desc', :scope =>"col", :id=> "vzebra-attachmenttype")%>
+        <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope =>"col", :id => "vzebra-action") %>
+        <%= sort_header_tag('operation', :caption => "", :scope =>"col", :id => "vzebra-children") %>
+        <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
+      </tr></thead>
+      <tbody>
+      <% @containers.each do |container| %>
+          <% next if container.attachments.empty? -%>
+          <% if container.is_a?(Version) -%>
+              <tr>
+                <th colspan="5" align="left" style="line-height: 30px; font-size: 14px; ">
+                  <%= link_to(h(container), {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package", :style => "color: #666666;") %>
+                </th>
+              </tr>
+          <% end -%>
+          <% container.attachments.each do |file| %>
+              <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>
+                <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
+                <td class="attach_type"><%= file.attachmentstype.typeName %></td>
+                <td class="downloads"><%= file.downloads %></td>
+                <!-- <td class="digest" width="300px"><%= file.description %></td> -->
+                <td align="center">
+                  <%= link_to(image_tag('delete.png'), attachment_path(file),
+                              :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
+                </td>
+              </tr>
+              <tr>
+                <td class='description' colspan="5">
+                  <div class="tags_area">
+                    <% @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %>
+                    <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"}%>
+                    <div class="tags_gradint"></div>
+                  </div>
+                  <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a></div>
+                </td>
+              </tr>
+          <% end -%>
+          <% reset_cycle %>
+      <% end -%>
+      <!-- %= h downloadAll(@containers) % -->
+      <!-- %= link_to "download all file", (downloadAll(@containers)) % -->
+
+      </tbody>
+    </table>
+  </ul>

app/views/files/_sort_by_attachtypel.html.erb

@@ -0,0 +1,57 @@
+<% selAttachType =@attachtype%>
+<% delete_allowed = User.current.allowed_to?(:manage_files, @project) %>
+<div id="catarory_browse_div" class="catarory_browse_div" >
+  <ul id="catarory_browse_ul">
+    <table class="list files" id="ver-zebra1" >
+      <colgroup>
+        <col class="vzebra-odd" />
+        <col class="vzebra-even" />
+        <col class="vzebra-odd" />
+        <col class="vzebra-even" />
+        <col class="vzebra-odd" />
+      </colgroup>
+      <thead><tr>
+        <%= sort_header_tag('filename', :caption => l(:field_filename), :scope =>"col" , :id => "vzebra-adventure")%>
+        <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc', :scope =>"col" , :id => "vzebra-comedy")%>
+        <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope =>"col", :id=> "vzebra-children")%>
+        <%= sort_header_tag('attach_type', :caption => l(:attachment_type), :default_order => 'desc', :scope =>"col", :id=> "vzebra-attachmenttype")%>
+        <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope =>"col", :id => "vzebra-action") %>
+        <%= sort_header_tag('operation', :caption => "", :scope =>"col", :id => "vzebra-children") %>
+        <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
+      </tr></thead>
+      <tbody>
+      <% @containers.each do |container| %>
+          <% next if container.attachments.empty? -%>
+          <% container.attachments.each do |file| %>
+             <% if file.attachtype==selAttachType%>
+              <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>
+                <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
+                <td class="attach_type"><%= file.attachmentstype.typeName %></td>
+                <td class="downloads"><%= file.downloads %></td>
+                <!-- <td class="digest" width="300px"><%= file.description %></td> -->
+                <td align="center">
+                  <%= link_to(image_tag('delete.png'), attachment_path(file),
+                              :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
+                </td>
+              </tr>
+              <tr>
+                <td class='description' colspan="5">
+                  <div class="tags_area">
+                    <% @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %>
+                    <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"}%>
+                    <div class="tags_gradint"></div>
+                  </div>
+                  <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a></div>
+                </td>
+              </tr>
+              <% end -%>
+          <% end -%>
+          <% reset_cycle %>
+      <% end -%>
+      <!-- %= h downloadAll(@containers) % -->
+      <!-- %= link_to "download all file", (downloadAll(@containers)) % -->
+
+      </tbody>
+    </table>

app/views/files/getattachtype.js.erb

@@ -0,0 +1,5 @@
+     <% if @attachtype==0%>
+     $("#all_browse_div").html('<%= j(render partial: "show_all_attachment")%>');
+     <%else%>
+     $("#all_browse_div").html('<%= j(render partial: "sort_by_attachtypel")%>');
+     <%end%>

app/views/files/index.html.erb

@@ -1,6 +1,4 @@
 <!-- <h3> --><!-- %=l(:label_attachment_plural)%></h3 -->
-<%isCategoryBrowser=false%>
-<% selAttachType =1%>
 <% attachmenttypes = @project.attachmenttypes %>
 <style>
     #ver-zebra, .file_table_des
@@ -187,7 +185,7 @@
     <% 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"),
-                         :onchange=>"attachmenttypes_search(this.value)"%>
+                         :onchange=>"attachmenttypes_searchex(this.value)"%>
      <% end %>
 
     <div id="upload_file_div" class="relation_file_div hidden" >
@@ -228,128 +226,10 @@
 
 <% delete_allowed = User.current.allowed_to?(:manage_files, @project) %>
 
-<%if !isCategoryBrowser%>
 <div id="all_browse_div" class="all_browse_div" >
- <ul id="all_browse_ul">
-  <table class="list files" id="ver-zebra" >
-    <colgroup>
-      <col class="vzebra-odd" />
-      <col class="vzebra-even" />
-      <col class="vzebra-odd" />
-      <col class="vzebra-even" />
-      <col class="vzebra-odd" />
-    </colgroup>
-    <thead><tr>
-      <%= sort_header_tag('filename', :caption => l(:field_filename), :scope =>"col" , :id => "vzebra-adventure")%>
-      <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc', :scope =>"col" , :id => "vzebra-comedy")%>
-      <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope =>"col", :id=> "vzebra-children")%>
-      <%= sort_header_tag('attach_type', :caption => l(:attachment_type), :default_order => 'desc', :scope =>"col", :id=> "vzebra-attachmenttype")%>
-      <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope =>"col", :id => "vzebra-action") %>
-      <%= sort_header_tag('operation', :caption => "", :scope =>"col", :id => "vzebra-children") %>
-      <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
-    </tr></thead>
-    <tbody>
-    <% @containers.each do |container| %>
-        <% next if container.attachments.empty? -%>
-        <% if container.is_a?(Version) -%>
-            <tr>
-              <th colspan="5" align="left" style="line-height: 30px; font-size: 14px; ">
-                <%= link_to(h(container), {:controller => 'versions', :action => 'show', :id => container}, :class => "icon icon-package", :style => "color: #666666;") %>
-              </th>
-            </tr>
-        <% end -%>
-        <% container.attachments.each do |file| %>
-            <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>
-              <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
-              <td class="attach_type"><%= file.attachmentstype.typeName %></td>
-              <td class="downloads"><%= file.downloads %></td>
-              <!-- <td class="digest" width="300px"><%= file.description %></td> -->
-              <td align="center">
-                <%= link_to(image_tag('delete.png'), attachment_path(file),
-                            :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
-              </td>
-            </tr>
-            <tr>
-              <td class='description' colspan="5">
-                <div class="tags_area">
-                  <% @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %>
-                  <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"}%>
-                  <div class="tags_gradint"></div>
-                </div>
-                <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a></div>
-              </td>
-            </tr>
-        <% end -%>
-        <% reset_cycle %>
-    <% end -%>
-    <!-- %= h downloadAll(@containers) % -->
-    <!-- %= link_to "download all file", (downloadAll(@containers)) % -->
-
-    </tbody>
-  </table>
-</ul>
+  <%= render :partial => 'show_all_attachment'%>
 </div>
-<%else%>
-<div id="catarory_browse_div" class="catarory_browse_div" >
-  <ul id="catarory_browse_ul">
-    <table class="list files" id="ver-zebra1" >
-      <colgroup>
-        <col class="vzebra-odd" />
-        <col class="vzebra-even" />
-        <col class="vzebra-odd" />
-        <col class="vzebra-even" />
-        <col class="vzebra-odd" />
-      </colgroup>
-      <thead><tr>
-        <%= sort_header_tag('filename', :caption => l(:field_filename), :scope =>"col" , :id => "vzebra-adventure")%>
-        <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc', :scope =>"col" , :id => "vzebra-comedy")%>
-        <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc', :scope =>"col", :id=> "vzebra-children")%>
-        <%= sort_header_tag('attach_type', :caption => l(:attachment_type), :default_order => 'desc', :scope =>"col", :id=> "vzebra-attachmenttype")%>
-        <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope =>"col", :id => "vzebra-action") %>
-        <%= sort_header_tag('operation', :caption => "", :scope =>"col", :id => "vzebra-children") %>
-        <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
-      </tr></thead>
-      <tbody>
-      <% @containers.each do |container| %>
-          <% next if container.attachments.empty? -%>
-          <% container.attachments.each do |file| %>
-             <% if file.attachtype==selAttachType%>
-              <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>
-                <td class="filesize"><%= number_to_human_size(file.filesize) %></td>
-                <td class="attach_type"><%= file.attachmentstype.typeName %></td>
-                <td class="downloads"><%= file.downloads %></td>
-                <!-- <td class="digest" width="300px"><%= file.description %></td> -->
-                <td align="center">
-                  <%= link_to(image_tag('delete.png'), attachment_path(file),
-                              :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
-                </td>
-              </tr>
-              <tr>
-                <td class='description' colspan="5">
-                  <div class="tags_area">
-                    <% @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %>
-                    <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"}%>
-                    <div class="tags_gradint"></div>
-                  </div>
-                  <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a></div>
-                </td>
-              </tr>
-              <% end -%>
-          <% end -%>
-          <% reset_cycle %>
-      <% end -%>
-      <!-- %= h downloadAll(@containers) % -->
-      <!-- %= link_to "download all file", (downloadAll(@containers)) % -->
 
-      </tbody>
-    </table>
-</ul>
-</div>
- <%end%>
 <% html_title(l(:label_attachment_plural)) -%>
 
 <script type='text/javascript'>
@@ -396,18 +276,19 @@
 
  </script>
 
-<%inited=false%>
+
 <script type="text/javascript">
-    function attachmenttypes_search(value){
-        $.ajax({
-                     <%if inited%>
-                    <% @isCategoryBrowser=!isCategoryBrowser%>
-                    <%@selAttachType=value%>
-                    <%= render :partial => 'new', locals: {isCategoryBrowser:@isCategoryBrowser,selAttachType:@selAttachType} %>
-                      <%end%>
-                    <%inited = true%>
-                }
+function attachmenttypes_searchex(value){
+    $.ajax({
+        url: '<%=getattachtype_project_files_path(project_id: @project)%>'+ '?type='+encodeURIComponent(value),
+        type :"POST" 
 
-        )
-    }
+    }).complete(function (xhr, textStatus) {
+        if (textStatus == 'success') {
+            eval(xhr.responseText);
+        } else if(textStatus =='error'){
+            alert('error');
+        };
+    });
+}
 </script>

config/routes.rb

@@ -19,7 +19,7 @@ RedmineApp::Application.routes.draw do
   resources :no_uses
   delete 'no_uses', :to => 'no_uses#delete'
 
-  resources :apply_project_masters
+   resources :apply_project_masters
   delete 'apply_project_masters', :to => 'apply_project_masters#delete'
 
 
@@ -299,7 +299,12 @@ RedmineApp::Application.routes.draw do
     # issue form update
     match 'issues/update_form', :controller => 'issues', :action => 'update_form', :via => [:put, :post], :as => 'issue_form'
 
-    resources :files, :only => [:index, :new, :create,:showbyattachtype]
+    resources :files, :only => [:index, :new, :create] do
+      collection do
+        match "getattachtype" , via: [:get, :post]
+        #match 'getattachtype/:attachtype', :to => 'files#getattachtype', via: [:get, :post]
+      end
+    end
 
     resources :versions, :except => [:index, :show, :edit, :update, :destroy] do
       collection do